diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-05-17 07:08:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-17 07:08:57 +0100 |
| commit | c3bdae6ce5aea707fe17abef8f351ca07d394eff (patch) | |
| tree | 3186b7bab1196e1fc8651f152371638cb224cdfb | |
| parent | 4c96ebf352e422feebda063de737d5394077794d (diff) | |
| parent | 88fd6601d81da77eb9792b7aeceb1db95365ec89 (diff) | |
| download | nixpkgs-c3bdae6ce5aea707fe17abef8f351ca07d394eff.tar nixpkgs-c3bdae6ce5aea707fe17abef8f351ca07d394eff.tar.gz nixpkgs-c3bdae6ce5aea707fe17abef8f351ca07d394eff.tar.bz2 nixpkgs-c3bdae6ce5aea707fe17abef8f351ca07d394eff.tar.lz nixpkgs-c3bdae6ce5aea707fe17abef8f351ca07d394eff.tar.xz nixpkgs-c3bdae6ce5aea707fe17abef8f351ca07d394eff.tar.zst nixpkgs-c3bdae6ce5aea707fe17abef8f351ca07d394eff.zip | |
Merge pull request #223861 from eliasnaur/no-nix-lib64-in-self-rpath
stdenv: don't set NIX_LIB*_IN_SELF_RPATH by default
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 6 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 734abb890c2..1861b044a39 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -311,12 +311,6 @@ _accumFlagsArray() { _addRpathPrefix() { if [ "${NIX_NO_SELF_RPATH:-0}" != 1 ]; then export NIX_LDFLAGS="-rpath $1/lib ${NIX_LDFLAGS-}" - if [ -n "${NIX_LIB64_IN_SELF_RPATH:-}" ]; then - export NIX_LDFLAGS="-rpath $1/lib64 ${NIX_LDFLAGS-}" - fi - if [ -n "${NIX_LIB32_IN_SELF_RPATH:-}" ]; then - export NIX_LDFLAGS="-rpath $1/lib32 ${NIX_LDFLAGS-}" - fi fi } diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6a743f60c9b..d327ef8b7fe 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -127,8 +127,6 @@ let '' export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}" - ${lib.optionalString (system == "x86_64-linux") "NIX_LIB64_IN_SELF_RPATH=1"} - ${lib.optionalString (system == "mipsel-linux") "NIX_LIB32_IN_SELF_RPATH=1"} ''; |