alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/nix-ld: also include ld.so in nixos profile

Browse source
This commit is contained in:
Jörg Thalheim 2023-06-05 09:56:05 +02:00
parent f3ae11b096
commit b60f21e135
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nixos/modules/programs/nix-ld.nix
View file

@ -2,15 +2,14 @@
let
cfg = config.programs.nix-ld;
# TODO make glibc here configurable?
nix-ld-so = pkgs.runCommand "ld.so" {} ''
ln -s "$(cat '${pkgs.stdenv.cc}/nix-support/dynamic-linker')" $out
'';
nix-ld-libraries = pkgs.buildEnv {
name = "lb-library-path";
pathsToLink = [ "/lib" ];
paths = map lib.getLib cfg.libraries;
# TODO make glibc here configurable?
postBuild = ''
ln -s ${pkgs.stdenv.cc.bintools.dynamicLinker} $out/share/nix-ld/lib/ld.so
'';
extraPrefix = "/share/nix-ld";
ignoreCollisions = true;
};
@ -60,7 +59,7 @@ in
environment.pathsToLink = [ "/share/nix-ld" ];
environment.variables = {
NIX_LD = toString nix-ld-so;
NIX_LD = "/run/current-system/sw/share/nix-ld/lib/ld.so";
NIX_LD_LIBRARY_PATH = "/run/current-system/sw/share/nix-ld/lib";
};
};