hotfix for missing /bin/sh in nix builds
This commit is contained in:
		
							parent
							
								
									fb720362a8
								
							
						
					
					
						commit
						9f87c397b4
					
				
							
								
								
									
										36
									
								
								124237.patch
									
									
									
									
									
										Normal file
									
								
							
							
								
								
								
								
								
									
									
								
							
						
						
									
										36
									
								
								124237.patch
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,36 @@
 | 
				
			|||||||
 | 
					From 113823669b9b71fff84bc592d1fd6022635c28eb Mon Sep 17 00:00:00 2001
 | 
				
			||||||
 | 
					From: regnat <rg@regnat.ovh>
 | 
				
			||||||
 | 
					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}
 | 
				
			||||||
@ -15,6 +15,8 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    channels.nixpkgs.input = nixpkgs;
 | 
					    channels.nixpkgs.input = nixpkgs;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    channels.nixpkgs.patches = [ ./124237.patch ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    hostDefaults = {
 | 
					    hostDefaults = {
 | 
				
			||||||
      modules = [
 | 
					      modules = [
 | 
				
			||||||
        utils.nixosModules.saneFlakeDefaults
 | 
					        utils.nixosModules.saneFlakeDefaults
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user