From 02c02f02238e9789e08e08b555fc8e34950a0363 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Thu, 6 Jul 2006 12:36:01 +0000 Subject: [PATCH] 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 --- .../gnome-icon-theme/gnome-icon-theme-2.14.2.nx | 13 +++++++++++++ .../gnome-icon-theme/gnome-icon-theme-2.14.2.patch | 12 ++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.nx create mode 100644 pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch diff --git a/pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.nx b/pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.nx new file mode 100644 index 000000000000..e5c7d408c65e --- /dev/null +++ b/pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.nx @@ -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]; +} diff --git a/pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch b/pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch new file mode 100644 index 000000000000..81b12cd1449f --- /dev/null +++ b/pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch @@ -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