From a9f8613dae32b10de3bdc8a86032dae43f80db32 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 16 Jan 2016 16:16:04 +0100 Subject: [PATCH] splix: 2.0.0 -> svn-r315 r315 has been in use for several years, but was never officially released --- pkgs/misc/cups/drivers/splix/default.nix | 37 +++++++++++++++--------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index 532ef2a45d5d..8c58d41f0fa3 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -1,24 +1,35 @@ -{stdenv, fetchurl, cups, zlib}: - -stdenv.mkDerivation rec { - name = "splix-2.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/splix/${name}.tar.bz2"; - sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp"; +{ stdenv, fetchsvn, fetchurl, cups, zlib }: +let rev = "r315"; in +stdenv.mkDerivation (rec { + name = "splix-svn-${rev}"; + src = fetchsvn { + # We build this from svn, because splix hasn't been in released in several years + # although the community has been adding some new printer models + # if you are having problems, please try the stable version below and report back + url = "svn://svn.code.sf.net/p/splix/code/splix"; + inherit rev; + sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl"; }; - patches = [ ./splix-2.0.0-gcc45.patch ]; - - preBuild='' + preBuild = '' makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model" ''; - buildInputs = [cups zlib]; + buildInputs = [ cups zlib ]; meta = { homepage = http://splix.sourceforge.net; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; -} + +} /* // { # uncomment to build the stable version + + name = "splix-2.0.0"; + patches = [ ./splix-2.0.0-gcc45.patch ]; + src = fetchurl { + url = "mirror://sourceforge/splix/${name}.tar.bz2"; + sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp"; + }; + +} */)