nixos/ldso: remove string context from linker soname
Unbreaks installer tests that otherwise start depending on i686-glibc
This commit is contained in:
parent
7e3d335152
commit
1950eec4aa
@ -4,11 +4,11 @@ let
|
|||||||
inherit (lib) last splitString mkOption types mdDoc optionals;
|
inherit (lib) last splitString mkOption types mdDoc optionals;
|
||||||
|
|
||||||
libDir = pkgs.stdenv.hostPlatform.libDir;
|
libDir = pkgs.stdenv.hostPlatform.libDir;
|
||||||
ldsoBasename = last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker);
|
ldsoBasename = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker));
|
||||||
|
|
||||||
pkgs32 = pkgs.pkgsi686Linux;
|
pkgs32 = pkgs.pkgsi686Linux;
|
||||||
libDir32 = pkgs32.stdenv.hostPlatform.libDir;
|
libDir32 = pkgs32.stdenv.hostPlatform.libDir;
|
||||||
ldsoBasename32 = last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker);
|
ldsoBasename32 = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker));
|
||||||
in {
|
in {
|
||||||
options = {
|
options = {
|
||||||
environment.ldso = mkOption {
|
environment.ldso = mkOption {
|
||||||
|
Loading…
Reference in New Issue
Block a user