splix: revert of revert of "2.0.0 -> svn-r315 version update"

This reverts commit e338d6a0fc. 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.
This commit is contained in:
Peter Simons 2016-03-18 11:30:29 +01:00
parent ab450f8477
commit 6c935046a7
2 changed files with 10 additions and 28 deletions

View file

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

View file

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