diff options
| author | Jeff Huffman <tejing@tejing.com> | 2023-11-24 22:51:50 -0500 |
|---|---|---|
| committer | Jeff Huffman <tejing@tejing.com> | 2023-12-03 16:23:44 -0500 |
| commit | 94a3c175826801407a66f4f992407755fdebf83d (patch) | |
| tree | db67dd7b20e633e42dd59788920b10d7e154a66d /pkgs/os-specific/linux | |
| parent | ab59f0dacc096d856f98c57500f366583b22059f (diff) | |
| download | nixlib-94a3c175826801407a66f4f992407755fdebf83d.tar nixlib-94a3c175826801407a66f4f992407755fdebf83d.tar.gz nixlib-94a3c175826801407a66f4f992407755fdebf83d.tar.bz2 nixlib-94a3c175826801407a66f4f992407755fdebf83d.tar.lz nixlib-94a3c175826801407a66f4f992407755fdebf83d.tar.xz nixlib-94a3c175826801407a66f4f992407755fdebf83d.tar.zst nixlib-94a3c175826801407a66f4f992407755fdebf83d.zip | |
lib.systems.elaborate: add libDir attribute
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 |