Author: viric
Date: Fri May 25 17:53:37 2012
New Revision: 34249
URL: https://nixos.org/websvn/nix/?rev=34249&sc=1
Log:
Making a trick on myEnv so I can put the cross gcc and some
'propagatedBuildInputs',
to have myEnv with cross-builders and cross-built libs.
(I'm trying by now to mingw64 + librsync.hostDrv)
Modified:
nixpkgs/trunk/pkgs/misc/my-env/default.nix
Modified: nixpkgs/trunk/pkgs/misc/my-env/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/my-env/default.nix Fri May 25 17:52:45 2012
(r34248)
+++ nixpkgs/trunk/pkgs/misc/my-env/default.nix Fri May 25 17:53:37 2012
(r34249)
@@ -56,17 +56,24 @@
and show you a shell with a prefixed prompt.
*/
-{ mkDerivation, substituteAll, pkgs } : { stdenv ? pkgs.stdenv, name,
buildInputs ? [], cTags ? [], extraCmds ? "", shell ?
"${pkgs.bashInteractive}/bin/bash"} :
+{ mkDerivation, substituteAll, pkgs }:
+ { stdenv ? pkgs.stdenv, name, buildInputs ? []
+ , propagatedBuildInputs ? [], gcc ? stdenv.gcc, cTags ? [], extraCmds ? ""
+ , shell ? "${pkgs.bashInteractive}/bin/bash"}:
+
mkDerivation {
# The setup.sh script from stdenv will expect the native build inputs in
# the buildNativeInputs environment variable.
- buildNativeInputs = [ ] ++ buildInputs ;
+ buildNativeInputs = [ ] ++ buildInputs;
+ # Trick to bypass the stdenv usual change of propagatedBuildInputs =>
propagatedNativeBuildInputs
+ propagatedBuildInputs2 = propagatedBuildInputs;
+
name = "env-${name}";
phases = [ "buildPhase" "fixupPhase" ];
setupNew = substituteAll {
src = ../../stdenv/generic/setup.sh;
initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; };
- gcc = stdenv.gcc;
+ inherit gcc;
};
buildPhase = ''
@@ -81,6 +88,7 @@
-i "$s"
cat >> "$out/dev-envs/''${name/env-/}" << EOF
buildNativeInputs="$buildNativeInputs"
+ propagatedBuildInputs="$propagatedBuildInputs2"
# the setup-new script wants to write some data to a temp file.. so just
let it do that and tidy up afterwards
tmp="\$("${pkgs.coreutils}/bin/mktemp" -d)"
NIX_BUILD_TOP="\$tmp"
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
