diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-09 11:23:56 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-09 11:23:56 -0400 |
| commit | 58082f0acb922f84f3747269486dd0d5961c2bdb (patch) | |
| tree | 64e29bddeedb86a64fd013ab9573c9c3f6c21b38 | |
| parent | 90d9f8ec1883ac10266a2c0c70d7b15566c81bfa (diff) | |
| download | nixpkgs-58082f0acb922f84f3747269486dd0d5961c2bdb.tar nixpkgs-58082f0acb922f84f3747269486dd0d5961c2bdb.tar.gz nixpkgs-58082f0acb922f84f3747269486dd0d5961c2bdb.tar.bz2 nixpkgs-58082f0acb922f84f3747269486dd0d5961c2bdb.tar.lz nixpkgs-58082f0acb922f84f3747269486dd0d5961c2bdb.tar.xz nixpkgs-58082f0acb922f84f3747269486dd0d5961c2bdb.tar.zst nixpkgs-58082f0acb922f84f3747269486dd0d5961c2bdb.zip | |
libgnomecups: Fix build
http://hydra.nixos.org/build/3149255
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/libgnomecups/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix | 10 |
2 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix index 0521ce9058f..9a0afd1275d 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }: +{ stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }: -let +stdenv.mkDerivation rec { name = "libgnomecups-0.2.3"; -in -stdenv.mkDerivation { - inherit name; src = fetchurl { url = "mirror://gnome/sources/libgnomecups/0.2/${name}.tar.bz2"; sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71"; }; + patches = [ ./glib.patch ]; + buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ]; + propagatedBuildInputs = [ libxml2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index 410e408baa3..0b6d3e25e2e 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -1,11 +1,8 @@ -{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl, libgnomecups, bison, -flex }: +{ stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl +, libgnomecups, bison, flex }: -let +stdenv.mkDerivation rec { name = "libgnomeprint-2.18.8"; -in -stdenv.mkDerivation { - inherit name; src = fetchurl { url = "mirror://gnome/sources/libgnomeprint/2.18/${name}.tar.bz2"; @@ -15,5 +12,6 @@ stdenv.mkDerivation { patches = [ ./bug653388.patch ]; buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ]; + propagatedBuildInputs = [ libxml2 ]; } |