diff options
| author | Luka Blaskovic <lblasc@tvbeat.com> | 2020-01-06 11:16:12 +0000 |
|---|---|---|
| committer | Luka Blaskovic <lblasc@tvbeat.com> | 2020-01-13 21:35:19 +0000 |
| commit | e2717ad9b7ed9743288e6dcafefcdced11605836 (patch) | |
| tree | 2332d862100d4f08a4da46c96c322eb1c9d0bef7 /pkgs/desktops/gnome-2 | |
| parent | 83069e18e67fce406663b10fd2100f815244aaf1 (diff) | |
| download | nixpkgs-e2717ad9b7ed9743288e6dcafefcdced11605836.tar nixpkgs-e2717ad9b7ed9743288e6dcafefcdced11605836.tar.gz nixpkgs-e2717ad9b7ed9743288e6dcafefcdced11605836.tar.bz2 nixpkgs-e2717ad9b7ed9743288e6dcafefcdced11605836.tar.lz nixpkgs-e2717ad9b7ed9743288e6dcafefcdced11605836.tar.xz nixpkgs-e2717ad9b7ed9743288e6dcafefcdced11605836.tar.zst nixpkgs-e2717ad9b7ed9743288e6dcafefcdced11605836.zip | |
libgnomeprint: build with bison3
Diffstat (limited to 'pkgs/desktops/gnome-2')
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index 453a4459fdd..44c4469c565 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl -, libgnomecups, bison2, flex }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl +, libgnomecups, bison, flex }: stdenv.mkDerivation rec { name = "libgnomeprint-2.18.8"; @@ -9,10 +9,17 @@ stdenv.mkDerivation rec { sha256 = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691"; }; - patches = [ ./bug653388.patch ]; + patches = [ + ./bug653388.patch + # Fix compatibility with bison 3 + (fetchpatch { + url = "https://github.com/pld-linux/libgnomeprint/raw/54c0f9c3675b86c53f6d77a5bc526ce9ef0e38cd/bison3.patch"; + sha256 = "1sp04jbv34i1gcwf377hhmwdsmqzig70dd06rjz1isb6zwh4y01l"; + }) + ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison2 flex ]; + buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison flex ]; propagatedBuildInputs = [ libxml2 ]; |