summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-07-11 16:04:14 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-07-12 15:30:56 -0400
commit8d76effc178747f0c8f456fe619c1b014736a6af (patch)
treed833ef116289f001853ec787a0ee6d91ffd776cc /pkgs/servers/x11
parent3cb745d5a69018829ac15f7d5a508135f6bda123 (diff)
downloadnixpkgs-8d76effc178747f0c8f456fe619c1b014736a6af.tar
nixpkgs-8d76effc178747f0c8f456fe619c1b014736a6af.tar.gz
nixpkgs-8d76effc178747f0c8f456fe619c1b014736a6af.tar.bz2
nixpkgs-8d76effc178747f0c8f456fe619c1b014736a6af.tar.lz
nixpkgs-8d76effc178747f0c8f456fe619c1b014736a6af.tar.xz
nixpkgs-8d76effc178747f0c8f456fe619c1b014736a6af.tar.zst
nixpkgs-8d76effc178747f0c8f456fe619c1b014736a6af.zip
stdenv-setup: Make the package accumulators associative arrays instead of strings
This is generally cleaner: less eval, less worrying about separators,
and probably also faster. I got the idea from that python wrapper
script.
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/builder.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 055886374df..3a8cf6fa6c8 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -18,14 +18,14 @@ postInstall() {
 
     for r in $requires; do
         if test -n "$crossConfig"; then
-            for p in $crossPkgs; do
+            for p in "${!crossPkgs[@]}"; do
                 if test -e $p/lib/pkgconfig/$r.pc; then
                     echo "  found requisite $r in $p"
                     propagatedBuildInputs="$propagatedBuildInputs $p"
                 fi
             done
         else
-            for p in $nativePkgs; do
+            for p in "${!nativePkgs[@]}"; do
                 if test -e $p/lib/pkgconfig/$r.pc; then
                     echo "  found requisite $r in $p"
                     propagatedNativeBuildInputs="$propagatedNativeBuildInputs $p"