Merge pull request #8994 from AndersonTorres/icewm

IceWM: 1.3.8 -> 1.3.10

Changed files
+29 -37
nixos
modules
services
x11
window-managers
pkgs
applications
window-managers
icewm
top-level
+1 -16
nixos/modules/services/x11/window-managers/icewm.nix
···
with lib;
let
-
cfg = config.services.xserver.windowManager.icewm;
-
in
-
{
-
###### interface
-
options = {
-
-
services.xserver.windowManager.icewm.enable = mkOption {
-
default = false;
-
description = "Enable the IceWM window manager.";
-
};
-
};
-
###### implementation
-
config = mkIf cfg.enable {
-
services.xserver.windowManager.session = singleton
{ name = "icewm";
start =
···
};
environment.systemPackages = [ pkgs.icewm ];
-
};
-
}
···
with lib;
let
cfg = config.services.xserver.windowManager.icewm;
in
{
###### interface
options = {
+
services.xserver.windowManager.icewm.enable = mkEnableOption "oroborus";
};
###### implementation
config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton
{ name = "icewm";
start =
···
};
environment.systemPackages = [ pkgs.icewm ];
};
}
+24 -20
pkgs/applications/window-managers/icewm/default.nix
···
-
{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, freetype
-
, fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }:
stdenv.mkDerivation rec {
-
name = "icewm-1.3.8";
buildInputs =
-
[ gettext libjpeg libtiff libungif libpng
-
xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr
-
xlibs.libICE xlibs.libSM freetype fontconfig
-
pkgconfig gdk_pixbuf
-
];
src = fetchurl {
-
url = "mirror://sourceforge/icewm/${name}.tar.gz";
-
sha256 = "066d1mw0vm9ygxnyxksfi6k4vzclvnlkvj04pj3kbcmv1fg8sn0p";
};
-
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 -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;
};
}
···
+
{ stdenv, fetchurl, cmake, gettext
+
, 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 {
+
name = "icewm-${version}";
+
version = "1.3.10";
buildInputs =
+
[ cmake gettext libjpeg libtiff libungif libpng imlib expat
+
freetype fontconfig pkgconfig gdk_pixbuf mkfontdir libX11
+
libXft libXext libXinerama libXrandr libICE libSM libXpm
+
libXdmcp libxcb libpthreadstubs ];
src = fetchurl {
+
url = "https://github.com/bbidulock/icewm/archive/${version}.tar.gz";
+
sha256 = "01i7a21gf810spmzjx32dxsmx4527qivs744rhvhaw4gr00amrns";
};
preConfigure = ''
+
export cmakeFlags="-DPREFIX=$out"
'';
meta = {
+
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/;
+
license = licenses.lgpl2;
+
maintainers = [ maintainers.AndersonTorres ];
+
platforms = platforms.unix;
};
}
+4 -1
pkgs/top-level/all-packages.nix
···
i810switch = callPackage ../os-specific/linux/i810switch { };
-
icewm = callPackage ../applications/window-managers/icewm { };
id3v2 = callPackage ../applications/audio/id3v2 { };
···
i810switch = callPackage ../os-specific/linux/i810switch { };
+
icewm = callPackage ../applications/window-managers/icewm {
+
inherit (xlibs) libX11 libXft libXext libXinerama
+
libXrandr libICE libSM;
+
};
id3v2 = callPackage ../applications/audio/id3v2 { };