diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-10-20 23:03:45 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-10-20 23:04:10 +0200 |
| commit | 4d5b89300296951f207ad2fcad35d1596fe7a319 (patch) | |
| tree | c334e4de0e8264c9897deb2ade31aaade779ac0b /pkgs/applications/window-managers | |
| parent | 171bcc5274b41226e5943247db1afb2e7559e23e (diff) | |
| parent | 4094d63dea7fafb8529ceaaa195f8e81e5dbe8a3 (diff) | |
| download | nixpkgs-4d5b89300296951f207ad2fcad35d1596fe7a319.tar nixpkgs-4d5b89300296951f207ad2fcad35d1596fe7a319.tar.gz nixpkgs-4d5b89300296951f207ad2fcad35d1596fe7a319.tar.bz2 nixpkgs-4d5b89300296951f207ad2fcad35d1596fe7a319.tar.lz nixpkgs-4d5b89300296951f207ad2fcad35d1596fe7a319.tar.xz nixpkgs-4d5b89300296951f207ad2fcad35d1596fe7a319.tar.zst nixpkgs-4d5b89300296951f207ad2fcad35d1596fe7a319.zip | |
Merge #19081: gnome-3.22
Also master commits are brought in.
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/i3/lock-fancy.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 378001528b1..6c53c51551a 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - rev = "b7196aaff72b90bb6ea0464a9f7b37d140db3230"; - name = "i3lock-fancy-2016-05-05_rev${builtins.substring 0 7 rev}"; + rev = "546ce2e71bd2339f2134904c7d22062e86105b46"; + name = "i3lock-fancy-unstable-2016-10-13_rev${builtins.substring 0 7 rev}"; src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; inherit rev; - sha256 = "0az43nqhmbniih3yw9kz5lnky0n7mxylvklsib76s4l2alf6i3ps"; + sha256 = "1pbxydwdfd7jlw3b8cnlwlrkqlyh5jyanfhjybndqmacd3y8vplb"; }; patchPhase = '' sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock @@ -19,15 +19,16 @@ stdenv.mkDerivation rec { sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock sed -i -e "s| awk | ${gawk}/bin/awk |" lock sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" lock - sed -i -e 's|ICON="$SCRIPTPATH/lockdark.png"|ICON="'$out'/share/i3lock-fancy/lockdark.png"|' lock - sed -i -e 's|ICON="$SCRIPTPATH/lock.png"|ICON="'$out'/share/i3lock-fancy/lock.png"|' lock + sed -i -e 's|ICON="$SCRIPTPATH/icons/lockdark.png"|ICON="'$out'/share/i3lock-fancy/icons/lockdark.png"|' lock + sed -i -e 's|ICON="$SCRIPTPATH/icons/lock.png"|ICON="'$out'/share/i3lock-fancy/icons/lock.png"|' lock sed -i -e "s|getopt |${getopt}/bin/getopt |" lock sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock + sed -i -e "s|SHOT=(import -window root)|SHOT=(${scrot}/bin/scrot -z)|" lock ''; installPhase = '' - mkdir -p $out/bin $out/share/i3lock-fancy + mkdir -p $out/bin $out/share/i3lock-fancy/icons cp lock $out/bin/i3lock-fancy - cp lock*.png $out/share/i3lock-fancy + cp icons/lock*.png $out/share/i3lock-fancy/icons ''; meta = with stdenv.lib; { description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text."; |