diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-12-28 18:47:41 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-12-28 18:47:41 +0000 |
| commit | 35fe5dadb15b431df9224442deb32a8024c7aff7 (patch) | |
| tree | 0c6ef39c559454d779ff6eb150da39cfa603d9d8 /pkgs/misc/cups | |
| parent | 5bb40967636c22f45b03dbbda9cc3b896ee76b27 (diff) | |
| download | nixlib-35fe5dadb15b431df9224442deb32a8024c7aff7.tar nixlib-35fe5dadb15b431df9224442deb32a8024c7aff7.tar.gz nixlib-35fe5dadb15b431df9224442deb32a8024c7aff7.tar.bz2 nixlib-35fe5dadb15b431df9224442deb32a8024c7aff7.tar.lz nixlib-35fe5dadb15b431df9224442deb32a8024c7aff7.tar.xz nixlib-35fe5dadb15b431df9224442deb32a8024c7aff7.tar.zst nixlib-35fe5dadb15b431df9224442deb32a8024c7aff7.zip | |
splix-2.0.0: fix compilation with gcc-4.5
svn path=/nixpkgs/branches/stdenv-updates/; revision=25312
Diffstat (limited to 'pkgs/misc/cups')
| -rw-r--r-- | pkgs/misc/cups/drivers/splix/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index 02970073b116..b832e928bef7 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp"; }; + patches = [ ./splix-2.0.0-gcc45.patch ]; + preBuild='' makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model" ''; diff --git a/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch b/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch new file mode 100644 index 000000000000..5ccdcb2514c5 --- /dev/null +++ b/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch @@ -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; |