3
0
Fork 0
forked from mirrors/nixpkgs

treewide: Don't use nativePkgs or crossPkgs anymore

This commit is contained in:
John Ericson 2017-08-12 12:41:49 -04:00
parent 046f091e0d
commit e0f1739c75
2 changed files with 3 additions and 8 deletions

View file

@ -222,8 +222,8 @@ stdenv.mkDerivation ({
setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"
# nativePkgs defined in stdenv/setup.hs
for p in "''${nativePkgs[@]}"; do
# host.*Pkgs defined in stdenv/setup.hs
for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then
cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/
continue

View file

@ -16,13 +16,8 @@ postInstall() {
echo "propagating requisites $requires"
if test -n "$crossConfig"; then
local pkgs=("${crossPkgs[@]}")
else
local pkgs=("${nativePkgs[@]}")
fi
for r in $requires; do
for p in "${pkgs[@]}"; do
for p in "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}"; do
if test -e $p/lib/pkgconfig/$r.pc; then
echo " found requisite $r in $p"
propagatedBuildInputs+=" $p"