diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-12-03 12:18:43 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-12-03 12:18:43 +0100 |
| commit | a510aa2672dae525c1eb152f00fd0e6f8eb10f39 (patch) | |
| tree | ee9b7efb3ca8049b84de1070e3cd2704c109f0f9 /pkgs/applications/window-managers | |
| parent | 077b7e5880628c12fe6a9ae0b10db848deb85b50 (diff) | |
| parent | e869896d00d9c7b1485b15e891d21213b4ff97f0 (diff) | |
| download | nixpkgs-a510aa2672dae525c1eb152f00fd0e6f8eb10f39.tar nixpkgs-a510aa2672dae525c1eb152f00fd0e6f8eb10f39.tar.gz nixpkgs-a510aa2672dae525c1eb152f00fd0e6f8eb10f39.tar.bz2 nixpkgs-a510aa2672dae525c1eb152f00fd0e6f8eb10f39.tar.lz nixpkgs-a510aa2672dae525c1eb152f00fd0e6f8eb10f39.tar.xz nixpkgs-a510aa2672dae525c1eb152f00fd0e6f8eb10f39.tar.zst nixpkgs-a510aa2672dae525c1eb152f00fd0e6f8eb10f39.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/dwm/dwm-status.nix | 14 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/ratpoison/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/tabbed/default.nix | 6 |
3 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 16a67030736..f88ef63bc2e 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,15 +1,21 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg -, enableAlsaUtils ? true, alsaUtils }: +, enableAlsaUtils ? true, alsaUtils, bash, coreutils }: + +let + binPath = stdenv.lib.makeBinPath [ + alsaUtils bash coreutils + ]; +in rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "1v9ksv8hdxhpm7vs71p9s1y3gnahczza0w4wyrk2fsc6x2kwlh6x"; + sha256 = "054lwgqpx3kbrnlsqbnd8fxsawvw3nl702pf56c7dcm4sfws15nl"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; @@ -19,7 +25,7 @@ rustPlatform.buildRustPackage rec { postInstall = lib.optionalString enableAlsaUtils '' wrapProgram $out/bin/dwm-status \ - --prefix "PATH" : "${alsaUtils}/bin" + --prefix "PATH" : "${binPath}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index fded0ee24a5..a69d3164a13 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.nongnu.org/ratpoison/; + homepage = https://www.nongnu.org/ratpoison/; description = "Simple mouse-free tiling window manager"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 3bb79f6a77d..a9c0f993d77 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "tabbed-20160425"; + name = "tabbed-20180310"; src = fetchgit { url = https://git.suckless.org/tabbed; - rev = "bc236142fa72d2f9d6b5c790d3f3a9a9168a7164"; - sha256 = "1fiv57g3jnlhnb6zrzl3n6lnpn2s9s0sd7bcv7r1nb3grwy7icri"; + rev = "b5f9ec647aae2d9a1d3bd586eb7523a4e0a329a3"; + sha256 = "0frj2yjaf0mfjwgyfappksfir52mx2xxd3cdg5533m5d88vbmxss"; }; inherit patches; |