summary refs log tree commit diff
path: root/pkgs/development/libraries/glibc/common.nix
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2021-11-03 11:54:15 +0100
committersternenseemann <sternenseemann@systemli.org>2021-11-04 13:05:59 +0100
commite9b9bea26190f6aaaabf01773c982d30aa0d6a66 (patch)
tree1814c8bebd41e107a26c9d0a89c10968fd0c918d /pkgs/development/libraries/glibc/common.nix
parent8440eddb32627ab12de939a010c2a68092e9c671 (diff)
downloadnixpkgs-e9b9bea26190f6aaaabf01773c982d30aa0d6a66.tar
nixpkgs-e9b9bea26190f6aaaabf01773c982d30aa0d6a66.tar.gz
nixpkgs-e9b9bea26190f6aaaabf01773c982d30aa0d6a66.tar.bz2
nixpkgs-e9b9bea26190f6aaaabf01773c982d30aa0d6a66.tar.lz
nixpkgs-e9b9bea26190f6aaaabf01773c982d30aa0d6a66.tar.xz
nixpkgs-e9b9bea26190f6aaaabf01773c982d30aa0d6a66.tar.zst
nixpkgs-e9b9bea26190f6aaaabf01773c982d30aa0d6a66.zip
glibc: include ldd and other scripts in cross-builds
Since the script interpreters are not patched (anymore?), no reference
to any shell is generated by the scripts in glibc's `bin` output:

```
$ nix-store --query --references /nix/store/nmfj3a2k2kr2lypndn37x6qbd8537f9b-glibc-riscv64-unknown-linux-gnu-2.33-50-bin
/nix/store/afgfd3vl3x5zx89awn3fjayn83yl9vcy-glibc-riscv64-unknown-linux-gnu-2.33-50
/nix/store/nmfj3a2k2kr2lypndn37x6qbd8537f9b-glibc-riscv64-unknown-linux-gnu-2.33-50-bin
```

This means that it's safe to include the scripts in glibc's bin output
even in cross builds. One interesting improvement for the future could
be to split these scripts into a separate derivation and properly patch
their script interpreter (currently they are using impure /bin/sh).
Diffstat (limited to 'pkgs/development/libraries/glibc/common.nix')
-rw-r--r--pkgs/development/libraries/glibc/common.nix5
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 3f78ef4041a..d9cbc8907a0 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -286,9 +286,4 @@ stdenv.mkDerivation ({
 
 // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
   preInstall = null; # clobber the native hook
-
-  # To avoid a dependency on the build system 'bash'.
-  preFixup = ''
-    rm -f $bin/bin/{ldd,tzselect,catchsegv,xtrace}
-  '';
 })