mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 04:57:56 +03:00
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
This commit is contained in:
parent
20ef19e1d2
commit
bd3f5e7340
@ -45,7 +45,7 @@ mkDerivation {
|
|||||||
# the buildNativeInputs environment variable.
|
# the buildNativeInputs environment variable.
|
||||||
buildNativeInputs = [ ] ++ buildInputs ;
|
buildNativeInputs = [ ] ++ buildInputs ;
|
||||||
name = "env-${name}";
|
name = "env-${name}";
|
||||||
phases = "buildPhase";
|
phases = [ "buildPhase" ];
|
||||||
setupNew = substituteAll {
|
setupNew = substituteAll {
|
||||||
src = ../../stdenv/generic/setup.sh;
|
src = ../../stdenv/generic/setup.sh;
|
||||||
preHook="";
|
preHook="";
|
||||||
@ -53,6 +53,7 @@ mkDerivation {
|
|||||||
initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; };
|
initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; };
|
||||||
gcc = stdenv.gcc;
|
gcc = stdenv.gcc;
|
||||||
};
|
};
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
set -x
|
set -x
|
||||||
mkdir -p "$out/dev-envs" "$out/nix-support"
|
mkdir -p "$out/dev-envs" "$out/nix-support"
|
||||||
@ -110,5 +111,6 @@ mkDerivation {
|
|||||||
export PATH
|
export PATH
|
||||||
echo $name loaded
|
echo $name loaded
|
||||||
EOF
|
EOF
|
||||||
|
exit 0
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user