diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-12 12:41:49 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-30 22:04:22 -0500 |
| commit | e0f1739c75c5bd2618d90789627b173066656f78 (patch) | |
| tree | 56fa41678bb0b90285fe9a882b95dd2f4b0d9423 /pkgs | |
| parent | 046f091e0d9853a81ce4d484a75cfa1b5fc9347d (diff) | |
| download | nixlib-e0f1739c75c5bd2618d90789627b173066656f78.tar nixlib-e0f1739c75c5bd2618d90789627b173066656f78.tar.gz nixlib-e0f1739c75c5bd2618d90789627b173066656f78.tar.bz2 nixlib-e0f1739c75c5bd2618d90789627b173066656f78.tar.lz nixlib-e0f1739c75c5bd2618d90789627b173066656f78.tar.xz nixlib-e0f1739c75c5bd2618d90789627b173066656f78.tar.zst nixlib-e0f1739c75c5bd2618d90789627b173066656f78.zip | |
treewide: Don't use `nativePkgs` or `crossPkgs` anymore
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/builder.sh | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 3e82003be43c..9a1d7e398c08 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -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 diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index bb3e5ac42832..5a832cb14d53 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -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" |