diff options
| -rw-r--r-- | lib/systems.nix | 4 | ||||
| -rw-r--r-- | lib/tests/release.nix | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/systems.nix b/lib/systems.nix index 25a83e9d14fa..92d8bdf892b4 100644 --- a/lib/systems.nix +++ b/lib/systems.nix @@ -84,10 +84,10 @@ rec { }; + is64Bit = matchAttrs { cpu = { bits = 64; }; }; isDarwin = matchAttrs { kernel = kernels.darwin; }; - isLinux = matchAttrs { kernel = kernels.linux; }; isi686 = matchAttrs { cpu = cpuTypes.i686; }; - is64Bit = matchAttrs { cpu = { bits = 64; }; }; + isLinux = matchAttrs { kernel = kernels.linux; }; # This should revert the job done by config.guess from the gcc compiler. diff --git a/lib/tests/release.nix b/lib/tests/release.nix index e7fb52f67665..093e9bcbf104 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation { buildCommand = '' datadir="${nix}/share" export TEST_ROOT=$(pwd)/test-tmp - export NIX_STORE_DIR=$TEST_ROOT/store + export NIX_BUILD_HOOK= + export NIX_CONF_DIR=$TEST_ROOT/etc + export NIX_DB_DIR=$TEST_ROOT/db export NIX_LOCALSTATE_DIR=$TEST_ROOT/var export NIX_LOG_DIR=$TEST_ROOT/var/log/nix - export NIX_STATE_DIR=$TEST_ROOT/var/nix - export NIX_DB_DIR=$TEST_ROOT/db - export NIX_CONF_DIR=$TEST_ROOT/etc export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests - export NIX_BUILD_HOOK= + export NIX_STATE_DIR=$TEST_ROOT/var/nix + export NIX_STORE_DIR=$TEST_ROOT/store export PAGER=cat cacheDir=$TEST_ROOT/binary-cache nix-store --init |