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

Merge pull request #8994 from AndersonTorres/icewm

Browse Source 
IceWM: 1.3.8 -> 1.3.10
This commit is contained in:
Arseniy Seroka 2015-07-26 20:04:54 +03:00
commit adedca45d5
3 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/services/x11/window-managers/icewm.nix
View File

@ -3,29 +3,16 @@
with lib; with lib;
let let
cfg = config.services.xserver.windowManager.icewm; cfg = config.services.xserver.windowManager.icewm;
in in
{ {
###### interface ###### interface
options = { options = {
services.xserver.windowManager.icewm.enable = mkEnableOption "oroborus";
services.xserver.windowManager.icewm.enable = mkOption {
default = false;
description = "Enable the IceWM window manager.";
};
}; };
###### implementation ###### implementation
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton services.xserver.windowManager.session = singleton
{ name = "icewm"; { name = "icewm";
start = start =
@ -36,7 +23,5 @@ in
}; };
environment.systemPackages = [ pkgs.icewm ]; environment.systemPackages = [ pkgs.icewm ];
}; };
} }

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

@ -1,35 +1,39 @@
{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, freetype { stdenv, fetchurl, cmake, gettext
, fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }: , libjpeg, libtiff, libungif, libpng, imlib, expat
, freetype, fontconfig, pkgconfig, gdk_pixbuf
, mkfontdir, libX11, libXft, libXext, libXinerama
, libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb
, libpthreadstubs }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "icewm-1.3.8"; name = "icewm-${version}";
version = "1.3.10";
buildInputs = buildInputs =
[ gettext libjpeg libtiff libungif libpng [ cmake gettext libjpeg libtiff libungif libpng imlib expat
xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr freetype fontconfig pkgconfig gdk_pixbuf mkfontdir libX11
xlibs.libICE xlibs.libSM freetype fontconfig libXft libXext libXinerama libXrandr libICE libSM libXpm
pkgconfig gdk_pixbuf libXdmcp libxcb libpthreadstubs ];
];
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/icewm/${name}.tar.gz"; url = "https://github.com/bbidulock/icewm/archive/${version}.tar.gz";
sha256 = "066d1mw0vm9ygxnyxksfi6k4vzclvnlkvj04pj3kbcmv1fg8sn0p"; sha256 = "01i7a21gf810spmzjx32dxsmx4527qivs744rhvhaw4gr00amrns";
}; };
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 = '' preConfigure = ''
cp -v ${automake}/share/automake*/config.{sub,guess} . export cmakeFlags="-DPREFIX=$out"
''; '';
meta = { meta = {
description = "A window manager for the X Window System"; description = "A simple, lightweight X window manager";
longDescription = ''
IceWM is a window manager for the X Window System. The goal of
IceWM is speed, simplicity, and not getting in the user's way.
'';
homepage = http://www.icewm.org/; homepage = http://www.icewm.org/;
platforms = stdenv.lib.platforms.unix; license = licenses.lgpl2;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.unix;
}; };
} }

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

@ -11668,7 +11668,10 @@ let
i810switch = callPackage ../os-specific/linux/i810switch { }; i810switch = callPackage ../os-specific/linux/i810switch { };
icewm = callPackage ../applications/window-managers/icewm { }; icewm = callPackage ../applications/window-managers/icewm {
inherit (xlibs) libX11 libXft libXext libXinerama
libXrandr libICE libSM;
};
id3v2 = callPackage ../applications/audio/id3v2 { }; id3v2 = callPackage ../applications/audio/id3v2 { };