diff options
| author | Domen Kožar <domen@dev.si> | 2015-08-25 14:14:54 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-08-25 14:14:54 +0200 |
| commit | e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c (patch) | |
| tree | f0f4637a7357352ae45007b99e384bebf7176520 /pkgs/build-support | |
| parent | 60a0bb7f66fd51a5b935ed50f8f39a34a5fc55cc (diff) | |
| parent | c234f37b5995457e2a5b518648e6735612cb3c27 (diff) | |
| download | nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.tar nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.tar.gz nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.tar.bz2 nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.tar.lz nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.tar.xz nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.tar.zst nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.zip | |
Merge branch 'staging'
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/builder-defs/builder-defs.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/setup-hooks/make-wrapper.sh | 4 | ||||
| -rw-r--r-- | pkgs/build-support/setup-hooks/move-docs.sh | 1 | ||||
| -rw-r--r-- | pkgs/build-support/setup-hooks/patch-shebangs.sh | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index 42d8f35b076d..e7c64501614c 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -569,7 +569,7 @@ let inherit (builtins) head tail trace; in # Interpreters that are already in the store are left untouched. echo "patching script interpreter paths" local f - for f in $(find "${dir}" -xtype f -perm +0100); do + for f in $(find "${dir}" -xtype f -perm /0100); do local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f") if test -n "$oldPath" -a "''${oldPath:0:''${#NIX_STORE}}" != "$NIX_STORE"; then local newPath=$(type -P $(basename $oldPath) || true) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 57607ba25b95..8965fc6bef0c 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -9,7 +9,7 @@ , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null, extraPackages ? [], extraBuildCommands ? "" , dyld ? null # TODO: should this be a setup-hook on dyld? -, isGNU ? false, isClang ? false +, isGNU ? false, isClang ? cc.isClang or false }: with stdenv.lib; diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index 41f2a59246d1..f474ff5e88ed 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -72,8 +72,8 @@ makeWrapper() { # Note: extraFlagsArray is an array containing additional flags # that may be set by --run actions. - echo exec "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper - + echo exec -a '"$0"' "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper + chmod +x $wrapper } diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh index c819ee12a9c9..57b71c15691d 100644 --- a/pkgs/build-support/setup-hooks/move-docs.sh +++ b/pkgs/build-support/setup-hooks/move-docs.sh @@ -42,6 +42,7 @@ _moveDocs() { _moveToOutput share/man "$man" _moveToOutput share/info "$info" _moveToOutput share/doc "$doc" + _moveToOutput share/gtk-doc "$doc" # Remove empty share directory. if [ -d "$out/share" ]; then diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 5a7f23b2d816..44ebad0d593b 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -18,7 +18,7 @@ patchShebangs() { local oldInterpreterLine local newInterpreterLine - find "$dir" -type f -perm +0100 | while read f; do + find "$dir" -type f -perm /0100 | while read f; do if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then # missing shebang => not a script continue |