Merge pull request #13509 from zimbatm/splix-leftover

splix: cleanup

pkgs/misc/cups/drivers/splix/default.nix

@@ -1,13 +1,12 @@
 { stdenv, fetchsvn, fetchurl, cups, zlib }:
-let rev = "r315"; in
-stdenv.mkDerivation (rec {
+let rev = "315"; 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
+    # although the community has been adding some new printer models.
     url = "svn://svn.code.sf.net/p/splix/code/splix";
-    inherit rev;
+    rev = "r${rev}";
     sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl";
   };
 
@@ -22,14 +21,4 @@ stdenv.mkDerivation (rec {
     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";
-  };  
-
-} */)
+}

pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch

@@ -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;