Unverified Commit c3bdae6c authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by GitHub
Browse files

Merge pull request #223861 from eliasnaur/no-nix-lib64-in-self-rpath 

stdenv: don't set NIX_LIB*_IN_SELF_RPATH by default
parents 4c96ebf3 88fd6601

pkgs/stdenv/generic/setup.sh

+0 −6
Original line number Diff line number Diff line
@@ -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

}

pkgs/stdenv/linux/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -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"}

    '';