flake: update nixpkgs

stdenv now sets DEVELOPER_DIR and SDKROOT to a Nixpkgs-internal SDK, unset if we want the platform Xcode SDK
mroi · Dec 27, 2024 · ac261dd · ac261dd
1 parent c919377
commit ac261dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -20,12 +20,7 @@
 	};
 	outputs = { self, nixpkgs, acextract, command-line, dsc-extractor, snap-util }: {
 		packages.x86_64-darwin = let
-			xcode = (nixpkgs.legacyPackages.x86_64-darwin.xcodeenv.composeXcodeWrapper {
-				version = "16.0";
-			}).overrideAttrs (attrs: { buildCommand = ''
-				# see https://github.com/NixOS/nixpkgs/pull/322641
-				set +o pipefail
-			'' + attrs.buildCommand; });
+			xcode = nixpkgs.legacyPackages.x86_64-darwin.xcodeenv.composeXcodeWrapper {};
 
 		in {
 
@@ -104,7 +99,10 @@
 					name = "snap-util-${lib.substring 0 8 self.inputs.snap-util.lastModifiedDate}";
 					src = snap-util;
 					nativeBuildInputs = [ xcode ];
-					preBuild = "NIX_CFLAGS_COMPILE='-idirafter ${snapshot-header}/bsd'";
+					preBuild = ''
+						unset DEVELOPER_DIR SDKROOT
+						NIX_CFLAGS_COMPILE='-idirafter ${snapshot-header}/bsd'
+					'';
 					installPhase = ''
 						mkdir -p $out/bin
 						cp snapUtil $out/bin/.snapUtil-wrapped