public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
nixpkgs/pkgs/stdenv/generic/builder.sh

26 lines
765 B
Bash
Raw Normal View History

Revert "stdenv: Store one package per line in nix-support/propagated-*" As @oxij points out in [1], this breakage is especially serious because it changes the contents of built environments without a corresonding change in their hashes. Also, the revert is easier than I thought. This reverts commit 3cb745d5a69018829ac15f7d5a508135f6bda123. [1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
2017-07-23 21:53:13 -07:00
export PATH=
* Don't require a stdenv to build stdenv. This obviates the need for a stdenvInitial in the bootstrap. svn path=/nixpkgs/branches/stdenv-updates/; revision=13942
2009-02-01 13:28:55 -08:00
for i in $initialPath; do
* Get rid of params1-5, they're obsolete. svn path=/nixpkgs/branches/stdenv-updates/; revision=31700
2012-01-19 07:29:20 -08:00
if [ "$i" = / ]; then i=; fi
* Don't require a stdenv to build stdenv. This obviates the need for a stdenvInitial in the bootstrap. svn path=/nixpkgs/branches/stdenv-updates/; revision=13942
2009-02-01 13:28:55 -08:00
PATH=$PATH${PATH:+:}$i/bin
done
* Don't strip debug info on Darwin, otherwise links by libtool fail ("/usr/bin/ld: can't use -s with -r (resulting file would not be relocatable)"). * Since stdenv/generic had to be modified for this, I forked it in situ. This should be merged later. svn path=/nixpkgs/trunk/; revision=1121
2004-07-02 03:05:53 -07:00
* Use the generic substituter in the generation of stdenv and gcc-wrapper. svn path=/nixpkgs/trunk/; revision=2269
2005-02-22 06:32:56 -08:00
mkdir $out
* Don't strip debug info on Darwin, otherwise links by libtool fail ("/usr/bin/ld: can't use -s with -r (resulting file would not be relocatable)"). * Since stdenv/generic had to be modified for this, I forked it in situ. This should be merged later. svn path=/nixpkgs/trunk/; revision=1121
2004-07-02 03:05:53 -07:00
stdenvs: Distinguish between `extraBuildInputs` and `extraNativeBuildInputs` Additionally, instead of pulling them from `setup.sh`, route them via Nix. This gets us one step closer to making stdenv be a plain attribute set instead of a derivation.
2017-08-15 08:30:45 -07:00
# Buid the setup script
stdenv: Don't use sed to build the setup script
2014-07-01 08:39:07 -07:00
echo "export SHELL=$shell" > $out/setup
echo "initialPath=\"$initialPath\"" >> $out/setup
echo "$preHook" >> $out/setup
* Prepend the "prehook" rather than sourcing it. * Don't call xargs with the -r flag in the Darwin bootstrap. svn path=/nixpkgs/branches/stdenv-updates/; revision=31703
2012-01-19 07:56:17 -08:00
cat "$setup" >> $out/setup
* Allow the user to install stdenv (nix-env -i stdenv) and get all the packages in the stdenv as propagated user environment packages. svn path=/nixpkgs/branches/stdenv-updates/; revision=15300
2009-04-25 07:08:29 -07:00
# Allow the user to install stdenv using nix-env and get the packages
# in stdenv.
stdenvs: Distinguish between `extraBuildInputs` and `extraNativeBuildInputs` Additionally, instead of pulling them from `setup.sh`, route them via Nix. This gets us one step closer to making stdenv be a plain attribute set instead of a derivation.
2017-08-15 08:30:45 -07:00
mkdir -p "$out/nix-support"
echo '# Hack to induce runtime dependencies on the default inputs' \
> "$out/nix-support/default-inputs.txt"
printf '%s\n' $defaultNativeBuildInputs $defaultBuildInputs \
>> "$out/nix-support/default-inputs.txt"
stdenv: Store one package per line in nix-support/propagated-* This makes those files a bit easier to read. Also, for what it's worth, it brings us one baby step closer to handling spaces in store paths. Also, I optimized handling of many transitive deps with read. Probably, not very beneficial, but nice to enforce the pkg-per-line structure. Doing so let me find much dubious code and fix it. Two misc notes: - `propagated-user-env-packages` also needed to be adjusted as sometimes it is copied to/from the propagated input files. - `local fd` should ensure that file descriptors aren't clobbered during recursion.
2017-07-10 08:59:14 -07:00
if [ "$propagatedUserEnvPkgs" ]; then
stdenvs: Distinguish between `extraBuildInputs` and `extraNativeBuildInputs` Additionally, instead of pulling them from `setup.sh`, route them via Nix. This gets us one step closer to making stdenv be a plain attribute set instead of a derivation.
2017-08-15 08:30:45 -07:00
printf '%s ' $propagatedUserEnvPkgs \
> "$out/nix-support/propagated-user-env-packages"
stdenv: Store one package per line in nix-support/propagated-* This makes those files a bit easier to read. Also, for what it's worth, it brings us one baby step closer to handling spaces in store paths. Also, I optimized handling of many transitive deps with read. Probably, not very beneficial, but nice to enforce the pkg-per-line structure. Doing so let me find much dubious code and fix it. Two misc notes: - `propagated-user-env-packages` also needed to be adjusted as sometimes it is copied to/from the propagated input files. - `local fd` should ensure that file descriptors aren't clobbered during recursion.
2017-07-10 08:59:14 -07:00
fi