diff options
| -rw-r--r-- | pkgs/misc/cups/drivers/splix/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch | 18 |
2 files changed, 10 insertions, 28 deletions
diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index 532ef2a45d5d..9a924e044d7f 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, cups, zlib}: - +{ stdenv, fetchsvn, fetchurl, cups, zlib }: +let rev = "315"; in stdenv.mkDerivation rec { - name = "splix-2.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/splix/${name}.tar.bz2"; - sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp"; + 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. + url = "svn://svn.code.sf.net/p/splix/code/splix"; + rev = "r${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" ''; diff --git a/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch b/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch deleted file mode 100644 index 5ccdcb2514c5..000000000000 --- a/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fixing build with gcc 4.5 - -http://bugs.gentoo.org/show_bug.cgi?id=318581 - -downloaded from -http://gentoo-overlays.zugaina.org/gentoo/portage/net-print/splix/files/splix-2.0.0-gcc45.patch - ---- splix-old/src/ppdfile.cpp -+++ splix-new/src/ppdfile.cpp -@@ -282,7 +282,7 @@ - * Opérateur d'assignation - * Assignment operator - */ --void PPDFile::Value::operator = (const PPDFile::Value::Value &val) -+void PPDFile::Value::operator = (const PPDFile::Value &val) - { - if (_preformatted) - delete[] _preformatted; |