From 488d9103a78bd562f781383acf33b29f91c99eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 2 Sep 2010 19:30:20 +0000 Subject: [PATCH] Updating icewm (so yes, gtk included gdk_pixbuf. Thank you niksnut!) svn path=/nixpkgs/branches/stdenv-updates/; revision=23603 --- pkgs/applications/window-managers/icewm/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 0215467bdce..02096cd6141 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib, xlibs, automake, pkgconfig, - gdk_pixbuf }: + gtk }: stdenv.mkDerivation rec { name = "icewm-1.3.6"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext libjpeg libtiff libungif libpng imlib xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr - pkgconfig gdk_pixbuf + pkgconfig gtk ]; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 209a33c377a..3feaf7d5503 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5717,7 +5717,9 @@ let icecatWrapper = wrapFirefox icecat3Xul "icecat" ""; - icewm = callPackage ../applications/window-managers/icewm { }; + icewm = callPackage ../applications/window-managers/icewm { + inherit (gtkLibs) gtk; + }; ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber