From bd3f5e73409b1980825e75e7e1a7cb8ad8b35131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 27 Mar 2011 14:08:13 +0000 Subject: [PATCH] Adding a key 'exit 0' to myenv. Otherwise it fails to build if pkgconfig is one of the build inputs. svn path=/nixpkgs/trunk/; revision=26547 --- pkgs/misc/my-env/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 7c6c2d46239..76080d8e114 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -45,7 +45,7 @@ mkDerivation { # the buildNativeInputs environment variable. buildNativeInputs = [ ] ++ buildInputs ; name = "env-${name}"; - phases = "buildPhase"; + phases = [ "buildPhase" ]; setupNew = substituteAll { src = ../../stdenv/generic/setup.sh; preHook=""; @@ -53,6 +53,7 @@ mkDerivation { initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; }; gcc = stdenv.gcc; }; + buildPhase = '' set -x mkdir -p "$out/dev-envs" "$out/nix-support" @@ -110,5 +111,6 @@ mkDerivation { export PATH echo $name loaded EOF + exit 0 ''; }