diff options
| -rw-r--r-- | nixos/modules/config/ldso.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/containers-imperative.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/config/ldso.nix b/nixos/modules/config/ldso.nix index e5ae13a21145..72ae3958d886 100644 --- a/nixos/modules/config/ldso.nix +++ b/nixos/modules/config/ldso.nix @@ -4,11 +4,11 @@ let inherit (lib) last splitString mkOption types mdDoc optionals; 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; libDir32 = pkgs32.stdenv.hostPlatform.libDir; - ldsoBasename32 = last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker); + ldsoBasename32 = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker)); in { options = { environment.ldso = mkOption { diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 18bec1db78e8..fff00e4f73a8 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -13,6 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { nix.settings.sandbox = false; nix.settings.substituters = []; # don't try to access cache.nixos.org + virtualisation.memorySize = 2048; virtualisation.writableStore = true; # Make sure we always have all the required dependencies for creating a # container available within the VM, because we don't have network access. |