diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-26 13:06:43 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-26 13:06:43 +0200 |
| commit | 7077a270bf625b320ab61e3951aa19c9d514b5dc (patch) | |
| tree | 42660271ea34c60368a6e3393ac5eedb65fe4a78 /pkgs/applications/window-managers | |
| parent | fea23020fef87f20fe81477d33eb9b8ca72e7f2e (diff) | |
| parent | 2273849a85e49d3a1fe55d11110cebb3377dddf6 (diff) | |
| download | nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.gz nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.bz2 nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.lz nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.xz nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.zst nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/ratpoison/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/sawfish/default.nix | 25 |
2 files changed, 22 insertions, 11 deletions
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index e550f9fdd83f..810803866890 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -12,11 +12,19 @@ stdenv.mkDerivation rec { sha256 = "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains"; }; + outputs = [ "out" "contrib" "doc" "info" ]; + buildInputs = [ pkgconfig perl autoconf automake libX11 inputproto libXt libXpm libXft libXtst xextproto libXi fontconfig freetype readline ]; + postInstall = '' + mkdir -p $contrib/{bin,share} + mv $out/bin/rpws $contrib/bin + mv $out/share/ratpoison $contrib/share + ''; + meta = with stdenv.lib; { homepage = "http://www.nongnu.org/ratpoison/"; description = "Simple mouse-free tiling window manager"; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index f3b19e846101..0f362e02ebf1 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -1,5 +1,8 @@ -{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango -, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo +{ stdenv, fetchurl +, pkgconfig, which, autoreconfHook +, rep-gtk, pango, gdk_pixbuf +, imlib, gettext, texinfo +, libXinerama, libXrandr, libXtst, libICE, libSM , makeWrapper }: @@ -8,18 +11,18 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sawfish-${version}"; - version = "1.11.90"; + version = "1.12.0"; + sourceName = "sawfish_${version}"; - src = fetchgit { - url = "https://github.com/SawfishWM/sawfish.git"; - rev = "b121f832571c9aebd228691c32604146e49f5e55"; - sha256 = "0y7rmjzp7ha5qj9q1dasw50gd6jiaxc0qsjbvyfzxvwssl3i9hsc"; + src = fetchurl { + url = "http://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; + sha256 = "1z7awzgw8d15aw17kpbj460pcxq8l2rhkaxk47w7yg9qrmg0xja4"; }; - buildInputs = - [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama - libXrandr libXtst imlib gettext texinfo makeWrapper - ]; + buildInputs = [ pkgconfig which autoreconfHook + rep-gtk pango gdk_pixbuf imlib gettext texinfo + libXinerama libXrandr libXtst libICE libSM + makeWrapper ]; patchPhase = '' sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in |