pyrox.dev
splix: revert of revert of "2.0.0 -> svn-r315 version update"
This reverts commit e338d6a0fc1293c1d5b63d9e38e690526fc7d1b1. I originally
reverted the update because it broke my Samsung printer. Now, it turns out that
this issue can be fixed by deleting and then re-creating the printer in CUPS to
update the driver.
It's possible that Gutenprints 'cups-genppdupdates' could remedy the situation
as well, but I had no chance to verify that since I don't use Gutenprint.
Closes https://github.com/NixOS/nixpkgs/issues/13734.
+10
-10
pkgs/misc/cups/drivers/splix/default.nix
+10
-10
pkgs/misc/cups/drivers/splix/default.nix
···
1
-
{stdenv, fetchurl, cups, zlib}:
2
-
1
+
{ stdenv, fetchsvn, fetchurl, cups, zlib }:
2
+
let rev = "315"; in
3
3
stdenv.mkDerivation rec {
4
-
name = "splix-2.0.0";
5
-
6
-
src = fetchurl {
7
-
url = "mirror://sourceforge/splix/${name}.tar.bz2";
8
-
sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp";
4
+
name = "splix-svn-${rev}";
5
+
src = fetchsvn {
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
+
url = "svn://svn.code.sf.net/p/splix/code/splix";
9
+
rev = "r${rev}";
10
+
sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl";
9
11
};
10
12
11
-
patches = [ ./splix-2.0.0-gcc45.patch ];
12
-
13
-
preBuild=''
13
+
preBuild = ''
14
14
makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
15
15
'';
16
16
-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;