From 73f1f5eb3969743fe459e7cc36cfb766c7f5318a Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 22 May 2016 13:41:15 +0200 Subject: imagemagick: split dev output to fix #9604 Also fixup references to imagemagick. --- pkgs/applications/window-managers/i3/lock-fancy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/window-managers') diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index ecf08a529d17..ce4517fe86aa 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i -e "s|dirname|${coreutils}/bin/dirname|" lock sed -i -e "s|rm |${coreutils}/bin/rm |" lock sed -i -e "s|scrot |${scrot}/bin/scrot |" lock - sed -i -e "s|convert |${imagemagick}/bin/convert |" lock + sed -i -e "s|convert |${imagemagick.out}/bin/convert |" lock sed -i -e "s|awk |${gawk}/bin/awk|" lock sed -i -e "s|i3lock |${i3lock-color}/bin/i3lock-color |" lock ''; -- cgit 1.4.1 From 16fc742bcfc5e1edce7d7a16da4581fed333a7e2 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Mon, 23 May 2016 08:28:19 -0300 Subject: fluxbox: fix @PREFIX@ in fluxbox-generate_menu script --- pkgs/applications/window-managers/fluxbox/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/window-managers') diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index 36e081ccfcf4..47febfa00e93 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -10,13 +10,22 @@ stdenv.mkDerivation rec { name = "fluxbox-${version}"; version = "1.3.7"; - buildInputs = [ pkgconfig freetype fribidi libXext libXft libXpm libXrandr libXrender xextproto libXinerama imlib2 ]; - src = fetchurl { url = "mirror://sourceforge/fluxbox/${name}.tar.xz"; sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w"; }; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ freetype fribidi libXext libXft libXpm libXrandr libXrender xextproto libXinerama imlib2 ]; + + enableParallelBuilding = true; + + preConfigure = '' + substituteInPlace util/fluxbox-generate_menu.in \ + --subst-var-by PREFIX "$out" + ''; + meta = { description = "Full-featured, light-resource X window manager"; longDescription = '' -- cgit 1.4.1 From 9c20849da40e60ffb4e879a8482957fadfe25d52 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 24 May 2016 12:37:04 +0200 Subject: i3lock-color: renaming bin/i3lock binary to bin/i3lock-color ... that it doesn't conflict with i3lock --- pkgs/applications/window-managers/i3/lock-color.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/applications/window-managers') diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 09be3500fecf..483c815db01b 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man/man1 ''; installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man"; + postInstall = '' + mv $out/bin/i3lock $out/bin/i3lock-color + ''; meta = with stdenv.lib; { description = "A simple screen locker like slock"; homepage = http://i3wm.org/i3lock/; -- cgit 1.4.1 From b614d72f4059cc7f61975eb226c4b0f4b37a73b2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 24 May 2016 12:38:23 +0200 Subject: i3lock-fancy: fix patching of the script --- pkgs/applications/window-managers/i3/lock-fancy.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'pkgs/applications/window-managers') diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index ecf08a529d17..652695b83e05 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -12,14 +12,15 @@ stdenv.mkDerivation rec { sha256 = "0az43nqhmbniih3yw9kz5lnky0n7mxylvklsib76s4l2alf6i3ps"; }; patchPhase = '' - sed -i -e "s|mktemp|${coreutils}/bin/mktemp|" lock - sed -i -e "s|\`pwd\`|$out/share/i3lock-fancy|" lock - sed -i -e "s|dirname|${coreutils}/bin/dirname|" lock - sed -i -e "s|rm |${coreutils}/bin/rm |" lock - sed -i -e "s|scrot |${scrot}/bin/scrot |" lock + sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock + sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" lock + sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" lock sed -i -e "s|convert |${imagemagick}/bin/convert |" lock - sed -i -e "s|awk |${gawk}/bin/awk|" lock - sed -i -e "s|i3lock |${i3lock-color}/bin/i3lock-color |" 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/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 ''; installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy -- cgit 1.4.1