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

Merge pull request #34162 from jokogr/u/i3lock

Browse Source 
i3lock-color: 2.9.1-c -> 2.10.1-1-c & i3lock-fancy: 2016-10-13 -> 2017-12-14
This commit is contained in:
adisbladis 2018-01-23 20:43:21 +08:00 committed by GitHub
commit 55a186bb21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/window-managers/i3/lock-color.nix
View File

@ -1,19 +1,22 @@
{ stdenv, fetchFromGitHub, which, pkgconfig, libxcb, xcbutilkeysyms { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxcb,
, xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon,
libxkbfile, libjpeg_turbo
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.9.1-c"; version = "2.10.1-1-c";
name = "i3lock-color-${version}"; name = "i3lock-color-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chrjguill"; owner = "PandorasFox";
repo = "i3lock-color"; repo = "i3lock-color";
rev = version; rev = "01476c56333cccae80cdd3f125b0b9f3a0fe2cb3";
sha256 = "0qnw71qbppgp3ywj1k07av7wkl9syfb8j6izrkhj143q2ks4rkvl"; sha256 = "06ca8496fkdkvh4ycg0b7kd3r1bjdqdwfimb51v4nj1lm87pdkdf";
}; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11 nativeBuildInputs = [ autoreconfHook pkgconfig ];
libev cairo libxkbcommon libxkbfile ]; buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11
libev cairo libxkbcommon libxkbfile libjpeg_turbo ];
makeFlags = "all"; makeFlags = "all";
preInstall = '' preInstall = ''

14
pkgs/applications/window-managers/i3/lock-fancy.nix
View File

@ -3,13 +3,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
rev = "546ce2e71bd2339f2134904c7d22062e86105b46"; rev = "3734fba160166006521e513f5734eb76ac6aa48f";
name = "i3lock-fancy-unstable-2016-10-13_rev${builtins.substring 0 7 rev}"; name = "i3lock-fancy-unstable-2017-12-14_rev${builtins.substring 0 7 rev}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "meskarune"; owner = "meskarune";
repo = "i3lock-fancy"; repo = "i3lock-fancy";
inherit rev; inherit rev;
sha256 = "1pbxydwdfd7jlw3b8cnlwlrkqlyh5jyanfhjybndqmacd3y8vplb"; sha256 = "1bg4xds2hmbq8rp6azbdqvgp1aaq5y1bp05cfwqqm6y3sjw7ywzl";
}; };
patchPhase = '' patchPhase = ''
sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock 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|convert |${imagemagick.out}/bin/convert |" lock
sed -i -e "s|awk -F|${gawk}/bin/awk -F|" 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| awk | ${gawk}/bin/awk |" lock
sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" 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/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|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|getopt |${getopt}/bin/getopt |" lock
sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" 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 = '' installPhase = ''
mkdir -p $out/bin $out/share/i3lock-fancy/icons mkdir -p $out/bin $out/share/i3lock-fancy/icons