diff options
| author | Elias Naur <mail@eliasnaur.com> | 2023-03-29 18:56:10 -0600 |
|---|---|---|
| committer | Elias Naur <mail@eliasnaur.com> | 2023-03-31 10:47:16 -0600 |
| commit | 88fd6601d81da77eb9792b7aeceb1db95365ec89 (patch) | |
| tree | d0d80edd71b53e0b098419da2fb43f1d04b73446 /pkgs/stdenv/linux | |
| parent | 823d5a4607fb6b2c5fc2e5e70357658b9ccc38c8 (diff) | |
| download | nixpkgs-88fd6601d81da77eb9792b7aeceb1db95365ec89.tar nixpkgs-88fd6601d81da77eb9792b7aeceb1db95365ec89.tar.gz nixpkgs-88fd6601d81da77eb9792b7aeceb1db95365ec89.tar.bz2 nixpkgs-88fd6601d81da77eb9792b7aeceb1db95365ec89.tar.lz nixpkgs-88fd6601d81da77eb9792b7aeceb1db95365ec89.tar.xz nixpkgs-88fd6601d81da77eb9792b7aeceb1db95365ec89.tar.zst nixpkgs-88fd6601d81da77eb9792b7aeceb1db95365ec89.zip | |
stdenv: remove the NIX_LIB*_IN_SELF_RPATH environment variables
The NIX_LIB64|32_IN_SELF_RPATH environment variables control whether to add lib64 and lib32 to rpaths. However, they're set depending on the build paltform, not the target platform and thus their values are incorrect for for cross-builds. On the other hand, setting them according to the build platform introduce pointless differences in build outputs; see #221350 for details. This change fixes the issues by boldly removes the NIX_LIB*_IN_SELF_RPATH facility altogether, in the hope that it is no longer necessary. They were introduced in 2009, long before nixpkgs had good support for cross-builds. Fixes #221350
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 51f217f03b2..10a374a213a 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -115,8 +115,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"} ''; |