diff options
author | Benjamin Hipple <bhipple@protonmail.com> | 2020-03-09 17:43:48 -0400 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-03-11 23:52:52 +0000 |
commit | d058d15f5ff6e2645c62e20e34208ad7b301b65d (patch) | |
tree | 86234a8dc1dea44a3666a09714a72639a09c05dd /pkgs/applications/window-managers | |
parent | cd8c987fbc72beee00cfa0458f272eecfe6991ac (diff) | |
download | nixlib-d058d15f5ff6e2645c62e20e34208ad7b301b65d.tar nixlib-d058d15f5ff6e2645c62e20e34208ad7b301b65d.tar.gz nixlib-d058d15f5ff6e2645c62e20e34208ad7b301b65d.tar.bz2 nixlib-d058d15f5ff6e2645c62e20e34208ad7b301b65d.tar.lz nixlib-d058d15f5ff6e2645c62e20e34208ad7b301b65d.tar.xz nixlib-d058d15f5ff6e2645c62e20e34208ad7b301b65d.tar.zst nixlib-d058d15f5ff6e2645c62e20e34208ad7b301b65d.zip |
leftwm: 0.1.10 -> 0.2.2
General update, but also along for the ride: - Upgrade cargo fetcher for https://github.com/NixOS/nixpkgs/issues/79975 - Quoted homepage for https://github.com/NixOS/rfcs/pull/45 - Switched to consistent 2-space indent - Cleaned up the meta section
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/leftwm/default.nix | 62 |
1 files changed, 28 insertions, 34 deletions
diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 25a219c2be42..ade3904b95c2 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -1,41 +1,35 @@ { stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: -let +let rpath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ]; in rustPlatform.buildRustPackage rec { - pname = "leftwm"; - version = "0.1.10"; - - src = fetchFromGitHub { - owner = "leftwm"; - repo = "leftwm"; - rev = version; - sha256 = "190lc48clkh9vzlsfg2a70w405k7xyyw7avnxwna1glfwmbyy2ag"; - }; - - buildInputs = [ makeWrapper libX11 libXinerama ]; - - postInstall = '' - wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}" - wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}" - wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}" - ''; - - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0mpvfix7bvc84vanha474l4gaq97ac1zy5l77z83m9jg0246yxd6"; - - # patch wrong version in Cargo.lock - cargoPatches = [ ./cargo-lock.patch ]; - - meta = { - description = "Leftwm - A tiling window manager for the adventurer"; - homepage = https://github.com/leftwm/leftwm; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ mschneider ]; - }; + pname = "leftwm"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "leftwm"; + repo = "leftwm"; + rev = version; + sha256 = "0x8cqc7zay19jxy7cshayjjwwjrcblqpmqrxipm2g5hhyjghk6q0"; + }; + + cargoSha256 = "1kphv3vnr8ij7raf0niwz3rwly986xi5fgwqg2ya0r46ifqkgvrc"; + + buildInputs = [ makeWrapper libX11 libXinerama ]; + + postInstall = '' + wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}" + wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}" + wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}" + ''; + + meta = with stdenv.lib; { + description = "Leftwm - A tiling window manager for the adventurer"; + homepage = "https://github.com/leftwm/leftwm"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ mschneider ]; + }; } |