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

Merge pull request #13739 from romildo/update.jwm

Browse Source 
jwm: 2.2.2 -> 1406
This commit is contained in:
Christoph Hrdinka 2016-03-08 18:23:52 +01:00
commit 1e3fef77d5
3 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/x11/window-managers/default.nix
View File

@ -17,6 +17,7 @@ in
./fluxbox.nix ./fluxbox.nix
./herbstluftwm.nix ./herbstluftwm.nix
./i3.nix ./i3.nix
./jwm.nix
./metacity.nix ./metacity.nix
./openbox.nix ./openbox.nix
./notion.nix ./notion.nix

25
nixos/modules/services/x11/window-managers/jwm.nix Normal file
View File

@ -0,0 +1,25 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.xserver.windowManager.jwm;
in
{
###### interface
options = {
services.xserver.windowManager.jwm.enable = mkEnableOption "jwm";
};
###### implementation
config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton {
name = "jwm";
start = ''
${pkgs.jwm}/bin/jwm &
waitPID=$!
'';
};
environment.systemPackages = [ pkgs.jwm ];
};
}

33
pkgs/applications/window-managers/jwm/default.nix
View File

@ -1,29 +1,30 @@
{ stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft, freetype, { stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, which, xorg,
fontconfig }: libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp, libpng,
libjpeg, expat, xproto, xextproto, xineramaproto, librsvg, gettext,
freetype, fontconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jwm-2.2.2"; name = "jwm-${version}";
version = "1406";
src = fetchurl { src = fetchurl {
url = "http://www.joewing.net/projects/jwm/releases/${name}.tar.xz"; url = "https://github.com/joewing/jwm/archive/s${version}.tar.gz";
sha256 = "0nhyy78c6imk85d47bakk460x0cfhkyghqq82zghmb00dhwiryln"; sha256 = "0yk22b7cshhyfpcqnb4p59yxspx95xg9yp1kmkxi2fyw95cacab4";
}; };
buildInputs = [ libX11 libXext libXinerama libXpm libXft freetype nativeBuildInputs = [ pkgconfig automake autoconf libtool which ];
fontconfig ];
preConfigure = '' buildInputs = [ libX11 libXext libXinerama libXpm libXft xorg.libXrender
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2 " libXau libXdmcp libpng libjpeg expat xproto xextproto xineramaproto
export NIX_LDFLAGS="$NIX_LDFLAGS -lXft -lfreetype -lfontconfig " librsvg gettext freetype fontconfig ];
'';
postInstall = preConfigure = "./autogen.sh";
''
sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc
sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc
'';
meta = { meta = {
homepage = "http://joewing.net/projects/jwm/";
description = "A window manager for X11 that requires only Xlib"; description = "A window manager for X11 that requires only Xlib";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.romildo ];
platforms = stdenv.lib.platforms.unix;
}; };
} }