diff options
Diffstat (limited to 'pkgs/applications/window-managers')
6 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index d4721c992008..3a2a030b8a4d 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ - --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl.bin}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" wrapProgram $out/bin/awesome-client \ --prefix PATH : "${which}/bin" diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index 09c36835dad6..46b8c8affc70 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -1,17 +1,19 @@ -{stdenv, fetchurl, cmake, pkgconfig +{ stdenv, fetchurl, cmake, pkgconfig , libXrender, renderproto, gtk, libwnck, pango, cairo , GConf, libXdamage, damageproto, libxml2, libxslt, glibmm , metacity , libstartup_notification, libpthreadstubs, libxcb, intltool , ORBit2, libXau, libICE, libSM , dbus, dbus_glib, librsvg, mesa -, libXdmcp, libnotify, python -, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus +, libXdmcp, libnotify, pythonPackages +, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf , xdg_utils , gettext, boost, pyrex , makeWrapper }: let + inherit (pythonPackages) python dbus-python pygtk; + s = # Generated upstream information rec { baseName="compiz"; @@ -29,7 +31,7 @@ let ORBit2 libXau libICE libSM dbus dbus_glib librsvg mesa libXdmcp libnotify python - hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus + hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk dbus-python xdg_utils gettext boost pyrex makeWrapper diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index afa7d123107b..61b356311785 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -4,13 +4,13 @@ libXrandr, libXrender, xwininfo }: stdenv.mkDerivation { - name = "compton-git-2015-09-21"; + name = "compton-git-2016-08-10"; src = fetchFromGitHub { owner = "chjj"; repo = "compton"; - rev = "2343e4bbd298b35ea5c190c52abd2b0cb9f79a18"; - sha256 = "1pb0ic47sfd796crwk47cya2ahbxsm6ygi6sh4fwd734kwz37h4z"; + rev = "f1cd308cde0f1e1f21ec2ac8f16a3c873fa22d3a"; + sha256 = "1ky438d1rsg4ylkcp60m82r0jck8rks3gfa869rc63k37p2nfn8p"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 460096cf16c8..c3425afd9880 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "jwm-${version}"; - version = "1535"; + version = "1548"; src = fetchurl { url = "https://github.com/joewing/jwm/archive/s${version}.tar.gz"; - sha256 = "1v593v1n9p9nvlhz1m9vc94wj21a6rbk7hcja30421h5mwa2b6gb"; + sha256 = "1ih5y7567vwcbnkjwm3cc9iq4n9rzz818mkh6ryli9ld230hla5r"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 91ee7dedb5db..2ce69a68f322 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/ chmod +x $out/bin/stumpish wrapProgram $out/bin/stumpish \ - --prefix PATH ":" "${rlwrap}/bin:${gnused}/bin:${gnugrep}/bin:${coreutils}/bin:${xprop}/bin" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}" # Paths in the compressed image $out/bin/stumpwm are not # recognized by Nix. Add explicit reference here. diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index c28d090e0bd7..e7994eaf05f7 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "wmsystemtray-1.4"; src = fetchurl { - url = http://sourceforge.net/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz; + url = mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz; sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9"; }; |