public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sway-contrib.grimshot: Reuse sway-unwrapped.src

Browse Source
This commit is contained in:
Michael Weiss 2020-06-25 14:59:25 +02:00
parent f1dd43404a
commit 81a214e62c
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/window-managers/sway/contrib.nix
View File

@ -18,23 +18,11 @@
grimshot = stdenv.mkDerivation rec { grimshot = stdenv.mkDerivation rec {
pname = "grimshot"; pname = "grimshot";
version = "2020-05-08"; version = sway-unwrapped.version;
rev = "b1d08db5f5112ab562f89564825e3e791b0682c4";
# master has new fixes and features, and a man page src = sway-unwrapped.src;
# 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";
};
msrc = fetchurl {
url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot.1";
sha256 = "191xxjfhf61gkxl3b0f694h0nrwd7vfnyp5afk8snhhr6q7ia4jz";
};
dontBuild = true; dontBuild = true;
dontUnpack = true;
dontConfigure = true; dontConfigure = true;
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
@ -42,9 +30,9 @@ grimshot = stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper installShellFiles ]; nativeBuildInputs = [ makeWrapper installShellFiles ];
installPhase = '' 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 \ wrapProgram $out/bin/grimshot --set PATH \
"${stdenv.lib.makeBinPath [ "${stdenv.lib.makeBinPath [
sway-unwrapped sway-unwrapped