commit
02357adddd
@ -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 {
|
||||||
|
@ -13,6 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
nix.settings.sandbox = false;
|
nix.settings.sandbox = false;
|
||||||
nix.settings.substituters = []; # don't try to access cache.nixos.org
|
nix.settings.substituters = []; # don't try to access cache.nixos.org
|
||||||
|
|
||||||
|
virtualisation.memorySize = 2048;
|
||||||
virtualisation.writableStore = true;
|
virtualisation.writableStore = true;
|
||||||
# Make sure we always have all the required dependencies for creating a
|
# Make sure we always have all the required dependencies for creating a
|
||||||
# container available within the VM, because we don't have network access.
|
# container available within the VM, because we don't have network access.
|
||||||
|
Loading…
Reference in New Issue
Block a user