summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-05-13 13:53:40 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-05-13 18:17:25 +0200
commite8e0995bd04c4342d0683f235299f7f72c3a940d (patch)
treeae99909cc9311483746ade6672ea82d3500077e5 /pkgs/servers/x11
parent0cc883f2ee12b8454bfff63d0d26c99bc8da2ca7 (diff)
downloadnixlib-e8e0995bd04c4342d0683f235299f7f72c3a940d.tar
nixlib-e8e0995bd04c4342d0683f235299f7f72c3a940d.tar.gz
nixlib-e8e0995bd04c4342d0683f235299f7f72c3a940d.tar.bz2
nixlib-e8e0995bd04c4342d0683f235299f7f72c3a940d.tar.lz
nixlib-e8e0995bd04c4342d0683f235299f7f72c3a940d.tar.xz
nixlib-e8e0995bd04c4342d0683f235299f7f72c3a940d.tar.zst
nixlib-e8e0995bd04c4342d0683f235299f7f72c3a940d.zip
Fix inputproto and probably other packages
"grep Requires" failed on *.pc files that had no Requires fields, due
to pipefail. But this error was previously masked by #7524.
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/builder.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 6ba50d245075..f5b8803a98a3 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -9,8 +9,10 @@ postInstall() {
     if test -n "$origPostInstall"; then eval "$origPostInstall"; fi
 
     local r p requires
+    set +o pipefail
     requires=$(grep "Requires:" $out/lib/pkgconfig/*.pc | \
         sed "s/Requires://" | sed "s/,/ /g")
+    set -o pipefail
 
     echo "propagating requisites $requires"