Author: viric
Date: Thu Sep 2 19:30:20 2010
New Revision: 23603
URL: https://svn.nixos.org/websvn/nix/?rev=23603&sc=1
Log:
Updating icewm (so yes, gtk included gdk_pixbuf. Thank you niksnut!)
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/window-managers/icewm/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/window-managers/icewm/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/window-managers/icewm/default.nix
Thu Sep 2 19:18:04 2010 (r23602)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/window-managers/icewm/default.nix
Thu Sep 2 19:30:20 2010 (r23603)
@@ -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 @@
buildInputs =
[ gettext libjpeg libtiff libungif libpng imlib
xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr
- pkgconfig gdk_pixbuf
+ pkgconfig gtk
];
src = fetchurl {
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Sep
2 19:18:04 2010 (r23602)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Sep
2 19:30:20 2010 (r23603)
@@ -5717,7 +5717,9 @@
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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
