diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-06-25 14:59:25 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2020-07-16 22:47:15 +0200 |
commit | 81a214e62c52e77110010f7eff5084a45d42706b (patch) | |
tree | aa6b69703d3134a55dd1648d18922e67ed96890e /pkgs/applications/window-managers/sway | |
parent | f1dd43404ad2addf0cf3b34f4195a0aa08449137 (diff) | |
download | nixpkgs-81a214e62c52e77110010f7eff5084a45d42706b.tar nixpkgs-81a214e62c52e77110010f7eff5084a45d42706b.tar.gz nixpkgs-81a214e62c52e77110010f7eff5084a45d42706b.tar.bz2 nixpkgs-81a214e62c52e77110010f7eff5084a45d42706b.tar.lz nixpkgs-81a214e62c52e77110010f7eff5084a45d42706b.tar.xz nixpkgs-81a214e62c52e77110010f7eff5084a45d42706b.tar.zst nixpkgs-81a214e62c52e77110010f7eff5084a45d42706b.zip |
sway-contrib.grimshot: Reuse sway-unwrapped.src
Diffstat (limited to 'pkgs/applications/window-managers/sway')
-rw-r--r-- | pkgs/applications/window-managers/sway/contrib.nix | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index e2c27fb470f..fd44f4a5be5 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -18,23 +18,11 @@ grimshot = stdenv.mkDerivation rec { pname = "grimshot"; - version = "2020-05-08"; - rev = "b1d08db5f5112ab562f89564825e3e791b0682c4"; - - # master has new fixes and features, and a man page - # after sway-1.5 these may be switched to sway-unwrapped.src - bsrc = fetchurl { - url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot"; - sha256 = "1awzmzkib8a7q5s78xyh8za03lplqfpbasqp3lidqqmjqs882jq9"; - }; + version = sway-unwrapped.version; - msrc = fetchurl { - url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot.1"; - sha256 = "191xxjfhf61gkxl3b0f694h0nrwd7vfnyp5afk8snhhr6q7ia4jz"; - }; + src = sway-unwrapped.src; dontBuild = true; - dontUnpack = true; dontConfigure = true; outputs = [ "out" "man" ]; @@ -42,9 +30,9 @@ grimshot = stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = '' - installManPage ${msrc} + installManPage contrib/grimshot.1 - install -Dm 0755 ${bsrc} $out/bin/grimshot + install -Dm 0755 contrib/grimshot $out/bin/grimshot wrapProgram $out/bin/grimshot --set PATH \ "${stdenv.lib.makeBinPath [ sway-unwrapped |