diff --git a/124237.patch b/124237.patch new file mode 100644 index 0000000..7163a1b --- /dev/null +++ b/124237.patch @@ -0,0 +1,36 @@ +From 113823669b9b71fff84bc592d1fd6022635c28eb Mon Sep 17 00:00:00 2001 +From: regnat +Date: Mon, 24 May 2021 10:51:02 +0200 +Subject: [PATCH] Revert "nixos/nix-daemon: fix sandbox-paths option" + +This reverts commit aeeee447bcc181d57a19d348f857326f4e1959fe. +--- + nixos/modules/services/misc/nix-daemon.nix | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix +index df745fa7168bc3..133e96da0ec8e6 100644 +--- a/nixos/modules/services/misc/nix-daemon.nix ++++ b/nixos/modules/services/misc/nix-daemon.nix +@@ -12,8 +12,6 @@ let + + isNix23 = versionAtLeast nixVersion "2.3pre"; + +- isNix24 = versionAtLeast nixVersion "2.4pre"; +- + makeNixBuildUser = nr: { + name = "nixbld${toString nr}"; + value = { +@@ -43,11 +41,7 @@ let + max-jobs = ${toString (cfg.maxJobs)} + cores = ${toString (cfg.buildCores)} + sandbox = ${if (builtins.isBool cfg.useSandbox) then boolToString cfg.useSandbox else cfg.useSandbox} +- ${if isNix24 then '' +- sandbox-paths = ${toString cfg.sandboxPaths} +- '' else '' +- extra-sandbox-paths = ${toString cfg.sandboxPaths} +- ''} ++ extra-sandbox-paths = ${toString cfg.sandboxPaths} + substituters = ${toString cfg.binaryCaches} + trusted-substituters = ${toString cfg.trustedBinaryCaches} + trusted-public-keys = ${toString cfg.binaryCachePublicKeys} diff --git a/flake.nix b/flake.nix index 39c87c6..800f5ee 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,8 @@ channels.nixpkgs.input = nixpkgs; + channels.nixpkgs.patches = [ ./124237.patch ]; + hostDefaults = { modules = [ utils.nixosModules.saneFlakeDefaults