pyrox.dev
lol
Merge pull request #13509 from zimbatm/splix-leftover
splix: cleanup
+5
-34
+5
-16
pkgs/misc/cups/drivers/splix/default.nix
+5
-16
pkgs/misc/cups/drivers/splix/default.nix
···
1
1
{ stdenv, fetchsvn, fetchurl, cups, zlib }:
2
-
let rev = "r315"; in
3
-
stdenv.mkDerivation (rec {
2
+
let rev = "315"; in
3
+
stdenv.mkDerivation rec {
4
4
name = "splix-svn-${rev}";
5
5
src = fetchsvn {
6
6
# We build this from svn, because splix hasn't been in released in several years
7
-
# although the community has been adding some new printer models
8
-
# if you are having problems, please try the stable version below and report back
7
+
# although the community has been adding some new printer models.
9
8
url = "svn://svn.code.sf.net/p/splix/code/splix";
10
-
inherit rev;
9
+
rev = "r${rev}";
11
10
sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl";
12
11
};
13
12
···
22
21
platforms = stdenv.lib.platforms.linux;
23
22
maintainers = [ stdenv.lib.maintainers.simons ];
24
23
};
25
-
26
-
} /* // { # uncomment to build the stable version
27
-
28
-
name = "splix-2.0.0";
29
-
patches = [ ./splix-2.0.0-gcc45.patch ];
30
-
src = fetchurl {
31
-
url = "mirror://sourceforge/splix/${name}.tar.bz2";
32
-
sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp";
33
-
};
34
-
35
-
} */)
24
+
}
-18
pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch
-18
pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch
···
1
-
Fixing build with gcc 4.5
2
-
3
-
http://bugs.gentoo.org/show_bug.cgi?id=318581
4
-
5
-
downloaded from
6
-
http://gentoo-overlays.zugaina.org/gentoo/portage/net-print/splix/files/splix-2.0.0-gcc45.patch
7
-
8
-
--- splix-old/src/ppdfile.cpp
9
-
+++ splix-new/src/ppdfile.cpp
10
-
@@ -282,7 +282,7 @@
11
-
* Opérateur d'assignation
12
-
* Assignment operator
13
-
*/
14
-
-void PPDFile::Value::operator = (const PPDFile::Value::Value &val)
15
-
+void PPDFile::Value::operator = (const PPDFile::Value &val)
16
-
{
17
-
if (_preformatted)
18
-
delete[] _preformatted;