gnome-icon-theme 2.14.2 requires pkgconfig 0.20, which stores its .pc files

in a different directory, so it breaks our PKGCONFIGPATH

svn path=/nixpkgs/trunk/; revision=5607
This commit is contained in:
Armijn Hemel 2006-07-06 12:36:01 +00:00
parent 68dad7fada
commit 02c02f0223
2 changed files with 25 additions and 0 deletions

View File

@ -0,0 +1,13 @@
{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser}:
assert pkgconfig != null && perl != null;
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig perl perlXMLParser];
# TODO: maybe this package as dependency on gnome-themes?
configureFlags = "--disable-hicolor-check";
patches = [./gnome-icon-theme-2.14.2.patch];
}

View File

@ -0,0 +1,12 @@
diff -ruN gnome-icon-theme-2.14.2/Makefile.in gnome-icon-theme-2.14.2.new/Makefile.in
--- gnome-icon-theme-2.14.2/Makefile.in 2006-03-14 21:20:19.000000000 +0100
+++ gnome-icon-theme-2.14.2.new/Makefile.in 2006-07-06 14:22:30.000000000 +0200
@@ -198,7 +198,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = 12x12 16x16 24x24 32x32 36x36 48x48 72x72 96x96 192x192 scalable po
-pkgconfigdir = $(datadir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnome-icon-theme.pc
THEME_IN_FILES = index.theme.in
icondir = $(datadir)/icons/gnome