diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2023-12-13 22:36:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-13 22:36:30 +0100 |
| commit | bef10a5ace31b021e938fced8e6b86cf293e4010 (patch) | |
| tree | b50d61ba673be2c785b5c355bf72ff614da0bb44 /pkgs/os-specific/linux | |
| parent | 29653f452eb7c6728d8c6600b7d27d6f483ca791 (diff) | |
| parent | 0863f6d2da0be5e8d7e3fb316ef58cdfe145220b (diff) | |
| download | nixlib-bef10a5ace31b021e938fced8e6b86cf293e4010.tar nixlib-bef10a5ace31b021e938fced8e6b86cf293e4010.tar.gz nixlib-bef10a5ace31b021e938fced8e6b86cf293e4010.tar.bz2 nixlib-bef10a5ace31b021e938fced8e6b86cf293e4010.tar.lz nixlib-bef10a5ace31b021e938fced8e6b86cf293e4010.tar.xz nixlib-bef10a5ace31b021e938fced8e6b86cf293e4010.tar.zst nixlib-bef10a5ace31b021e938fced8e6b86cf293e4010.zip | |
Merge pull request #269551 from tejing1/nixos-stub-ld
nixos/stub-ld: init module
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/nix-ld/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/nix-ld/default.nix b/pkgs/os-specific/linux/nix-ld/default.nix index 5eebe6773147..bb6489ecdb17 100644 --- a/pkgs/os-specific/linux/nix-ld/default.nix +++ b/pkgs/os-specific/linux/nix-ld/default.nix @@ -5,11 +5,7 @@ , ninja , nixosTests }: -let - libDir = if builtins.elem stdenv.system [ "x86_64-linux" "mips64-linux" "powerpc64le-linux" ] - then "/lib64" - else "/lib"; -in + stdenv.mkDerivation rec { pname = "nix-ld"; version = "1.2.2"; @@ -36,7 +32,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/nix-support - ldpath=${libDir}/$(basename $(< ${stdenv.cc}/nix-support/dynamic-linker)) + ldpath=/${stdenv.hostPlatform.libDir}/$(basename $(< ${stdenv.cc}/nix-support/dynamic-linker)) echo "$ldpath" > $out/nix-support/ldpath mkdir -p $out/lib/tmpfiles.d/ cat > $out/lib/tmpfiles.d/nix-ld.conf <<EOF |