From 293027453f713fce5b3a5b7660ce8003395a4604 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jul 2012 11:28:15 +0200 Subject: [PATCH] i3: fixed build - The make variable PREFIX must be at build time because common.mk uses it to decide where to expect $SYSCONFDIR. - The make target "all" is run by default and needn't be set explicitly. - Shebang paths in scripts are patched automatically be the default builder, we don't have to do that manually. --- pkgs/applications/window-managers/i3/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 04e50f808274..3a3a3626fb93 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -13,18 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm libstartup_notification libX11 pcre libev yajl flex libXcursor perl ]; - prePatch = '' - sed s,/usr/bin/env,${coreutils}/bin/env, -i generate-command-parser.pl - sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-migrate-config-to-v4 - sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-wsbar - ''; - - makeFlags = "all"; - installFlags = "PREFIX=\${out}"; + configurePhase = "makeFlags=PREFIX=$out"; meta = { description = "i3 is a tiling window manager"; - homepage = http://i3wm.org; + homepage = "http://i3wm.org"; maintainers = [ stdenv.lib.maintainers.garbas ]; license = stdenv.lib.licenses.bsd3; };