JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/libpng15/; revision=31891
This commit is contained in:
Yury G. Kudryashov 2012-01-27 18:57:35 +00:00
parent 83d4b462fe
commit e9e0418145
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/window-managers/icewm/default.nix
View File

@ -1,29 +1,33 @@
{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib
, xlibs, automake, pkgconfig, gtk }:
{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, freetype
, fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }:
stdenv.mkDerivation rec {
name = "icewm-1.3.6";
name = "icewm-1.3.7";
buildInputs =
[ gettext libjpeg libtiff libungif libpng imlib
[ gettext libjpeg libtiff libungif libpng
xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr
pkgconfig gtk
xlibs.libICE xlibs.libSM freetype fontconfig
pkgconfig gdk_pixbuf
];
src = fetchurl {
url = "mirror://sourceforge/icewm/${name}.tar.gz";
sha256 = "1pr7rc10rddwvy4ncng4mf5fpxd1nqjsw34xba9ngsg32rg57b91";
sha256 = "0yw813d8amrl0n1fvdiyznxah92wcylj9kj1qhjc6h73d827h6na";
};
NIX_LDFLAGS = "-lfontconfig";
# The fuloong2f is not supported by 1.3.6 still
#
# Don't know whether 1.3.7 supports fuloong2f and don't know how to test it
# on x86_64 hardware. So I left this 'cp' -- urkud
preConfigure = ''
cp ${automake}/share/automake*/config.{sub,guess} .
cp -v ${automake}/share/automake*/config.{sub,guess} .
'';
meta = {
description = "A window manager for the X Window System";
homepage = http://www.icewm.org/;
platforms = stdenv.lib.platforms.unix;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -7046,9 +7046,7 @@ let
icecat3Wrapper = wrapFirefox { browser = icecat3Xul; browserName = "icecat"; desktopName = "IceCat"; };
icewm = callPackage ../applications/window-managers/icewm {
inherit (gtkLibs) gtk;
};
icewm = callPackage ../applications/window-managers/icewm { };
id3v2 = callPackage ../applications/audio/id3v2 { };