diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 6c53c51551ac..e28a9cf75be8 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 = "546ce2e71bd2339f2134904c7d22062e86105b46"; - name = "i3lock-fancy-unstable-2016-10-13_rev${builtins.substring 0 7 rev}"; + rev = "3734fba160166006521e513f5734eb76ac6aa48f"; + name = "i3lock-fancy-unstable-2017-12-14_rev${builtins.substring 0 7 rev}"; src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; inherit rev; - sha256 = "1pbxydwdfd7jlw3b8cnlwlrkqlyh5jyanfhjybndqmacd3y8vplb"; + sha256 = "1bg4xds2hmbq8rp6azbdqvgp1aaq5y1bp05cfwqqm6y3sjw7ywzl"; }; patchPhase = '' sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { sed -i -e "s|convert |${imagemagick.out}/bin/convert |" lock 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/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|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" 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 + sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" lock ''; installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy/icons