diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-12-30 22:58:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 22:58:02 -0500 |
| commit | 4d2b7638173afb4c0f0c12a43654bcff5c9500ab (patch) | |
| tree | 04068195f42530a34d44a63019ddc9f77654804c /pkgs/servers/x11/xorg | |
| parent | 553fd19e679b68082329fdae40dcfb40c2f72cba (diff) | |
| parent | a98e68676dc96e9021d9bb0a9f210ac1a35d368b (diff) | |
| download | nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.gz nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.bz2 nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.lz nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.xz nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.zst nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.zip | |
Merge pull request #26805 from obsidiansystems/cross-elegant
Make cross compilation elegant
Diffstat (limited to 'pkgs/servers/x11/xorg')
| -rw-r--r-- | pkgs/servers/x11/xorg/builder.sh | 7 |
1 files changed, 1 insertions, 6 deletions
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" |