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

This reverts commit 6ea526462b and a9f8613dae to fix
https://github.com/NixOS/nixpkgs/issues/13734.
This commit is contained in:
Peter Simons 2016-03-07 13:32:20 +01:00
parent f0e5bf02e2
commit e338d6a0fc
2 changed files with 29 additions and 11 deletions

View file

@ -1,20 +1,20 @@
{ stdenv, fetchsvn, fetchurl, cups, zlib }:
let rev = "315"; in
{stdenv, fetchurl, cups, zlib}:
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.
url = "svn://svn.code.sf.net/p/splix/code/splix";
rev = "r${rev}";
sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl";
name = "splix-2.0.0";
src = fetchurl {
url = "mirror://sourceforge/splix/${name}.tar.bz2";
sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp";
};
preBuild = ''
patches = [ ./splix-2.0.0-gcc45.patch ];
preBuild=''
makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
'';
buildInputs = [ cups zlib ];
buildInputs = [cups zlib];
meta = {
homepage = http://splix.sourceforge.net;

View file

@ -0,0 +1,18 @@
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;