diff --git a/flake.lock b/flake.lock index d5b7294..122787f 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719468428, - "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", + "lastModified": 1734988233, + "narHash": "sha256-Ucfnxq1rF/GjNP3kTL+uTfgdoE9a3fxDftSfeLIS8mA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", + "rev": "de1864217bfa9b5845f465e771e0ecb48b30e02d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index befafb6..3b2bc50 100644 --- 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