diff options
author | Christoph Hrdinka <c.github@hrdinka.at> | 2016-03-08 18:23:52 +0100 |
---|---|---|
committer | Christoph Hrdinka <c.github@hrdinka.at> | 2016-03-08 18:23:52 +0100 |
commit | 1e3fef77d5b777f413595e4d9fc3d1334c9354d2 (patch) | |
tree | 48e7c504cb44f9b9490b82da43c69e82d2d85e3a /pkgs | |
parent | efb76ae10bfa484205d5bd9bbb58c1d32654d984 (diff) | |
parent | 5856e89b2cbccf40d2f1b8d72e0356cbbedc9e2d (diff) |
Merge pull request #13739 from romildo/update.jwm
jwm: 2.2.2 -> 1406
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/window-managers/jwm/default.nix | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index f019ba9751b9c..adbdef5e2844a 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,29 +1,30 @@ -{ stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft, freetype, - fontconfig }: +{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, which, xorg, + libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp, libpng, + libjpeg, expat, xproto, xextproto, xineramaproto, librsvg, gettext, + freetype, fontconfig }: stdenv.mkDerivation rec { - name = "jwm-2.2.2"; + name = "jwm-${version}"; + version = "1406"; src = fetchurl { - url = "http://www.joewing.net/projects/jwm/releases/${name}.tar.xz"; - sha256 = "0nhyy78c6imk85d47bakk460x0cfhkyghqq82zghmb00dhwiryln"; + url = "https://github.com/joewing/jwm/archive/s${version}.tar.gz"; + sha256 = "0yk22b7cshhyfpcqnb4p59yxspx95xg9yp1kmkxi2fyw95cacab4"; }; - buildInputs = [ libX11 libXext libXinerama libXpm libXft freetype - fontconfig ]; + nativeBuildInputs = [ pkgconfig automake autoconf libtool which ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2 " - export NIX_LDFLAGS="$NIX_LDFLAGS -lXft -lfreetype -lfontconfig " - ''; + buildInputs = [ libX11 libXext libXinerama libXpm libXft xorg.libXrender + libXau libXdmcp libpng libjpeg expat xproto xextproto xineramaproto + librsvg gettext freetype fontconfig ]; - postInstall = - '' - sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc - sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc - ''; + preConfigure = "./autogen.sh"; meta = { + homepage = "http://joewing.net/projects/jwm/"; 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; }; } |