summary refs log tree commit diff
path: root/pkgs/desktops/gnome-2/platform
diff options
context:
space:
mode:
authorMarc Weber <marco-oweber@gmx.de>2013-09-20 21:36:17 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-11-01 10:32:24 +0100
commit4a96c8cf6aae464c5ec4a92cb8113c24060f8fed (patch)
tree7b85db4a92e6b0962921dc5b8edb6536648dc232 /pkgs/desktops/gnome-2/platform
parent23f495689e73308d1826ee49acfa65a089889703 (diff)
downloadnixpkgs-4a96c8cf6aae464c5ec4a92cb8113c24060f8fed.tar
nixpkgs-4a96c8cf6aae464c5ec4a92cb8113c24060f8fed.tar.gz
nixpkgs-4a96c8cf6aae464c5ec4a92cb8113c24060f8fed.tar.bz2
nixpkgs-4a96c8cf6aae464c5ec4a92cb8113c24060f8fed.tar.lz
nixpkgs-4a96c8cf6aae464c5ec4a92cb8113c24060f8fed.tar.xz
nixpkgs-4a96c8cf6aae464c5ec4a92cb8113c24060f8fed.tar.zst
nixpkgs-4a96c8cf6aae464c5ec4a92cb8113c24060f8fed.zip
gnome-autogen.sh: make check_m4macros aware of ACLOCAL_PATH
Diffstat (limited to 'pkgs/desktops/gnome-2/platform')
-rw-r--r--pkgs/desktops/gnome-2/platform/gnome-common/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
index 548783abf79..929ed44b752 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl_gnome }:
+{ stdenv, fetchurl, fetchurl_gnome, which }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
@@ -8,4 +8,11 @@ stdenv.mkDerivation rec {
     major = "2"; minor = "34"; patchlevel = "0";
     sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s";
   };
+
+  propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which
+
+  patches = [(fetchurl {
+    url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
+    sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
+  })];
 }