From 4ed7ef68db05e11eedeb28aa32e62d14ff35deb6 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Sun, 20 Aug 2023 20:52:59 +0200 Subject: [PATCH] flake: update for Xcode 14.3.1 makeSetupHook parameters changed --- flake.lock | 12 ++++++------ flake.nix | 7 +++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index fdd8dff..d7227ed 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ "dsc-extractor": { "flake": false, "locked": { - "lastModified": 1662651226, - "narHash": "sha256-pI9pP5QhO1X2hdJTxVl8p1xp+bDJzzfCsVNebDUTd0o=", + "lastModified": 1688099356, + "narHash": "sha256-NaPFOiPwGdwVxxZr5eRklhD41IKw8DvYoZg0kLReY5k=", "owner": "keith", "repo": "dyld-shared-cache-extractor", - "rev": "c9da45a40a70d9fc0d1c955190b9efb685e55cf6", + "rev": "ac746c15a62f51e1ff32e4d101b5d8c70f2cb2fe", "type": "github" }, "original": { @@ -50,11 +50,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671936867, - "narHash": "sha256-tOok3/MJWoRUEoPU5Ma/cTCeuw8ACx3Ozu1MlFcdvc8=", + "lastModified": 1692494774, + "narHash": "sha256-noGVoOTyZ2Kr5OFglzKYOX48cx3hggdCPbXrYMG2FDw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18ee49839ea8817218c3bfe3a62e06f47a10fdd5", + "rev": "3476a10478587dec90acb14ec6bde0966c545cc0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 40adaa3..0d2953e 100644 --- a/flake.nix +++ b/flake.nix @@ -25,12 +25,15 @@ outputs = { self, nixpkgs, acextract, command-line, dsc-extractor, snapshot-header, snap-util }: { packages.x86_64-darwin = let xcode = (nixpkgs.legacyPackages.x86_64-darwin.xcodeenv.composeXcodeWrapper { - version = "14.3"; + version = "14.3.1"; }).overrideAttrs (attrs: { __noChroot = true; }); in { acextract = with import nixpkgs { system = "x86_64-darwin"; }; - let xcodeHook = makeSetupHook { deps = [ xcode ]; } "${xcbuildHook}/nix-support/setup-hook"; + let xcodeHook = makeSetupHook { + name = "xcode-hook"; + propagatedBuildInputs = [ xcode ]; + } "${xcbuildHook}/nix-support/setup-hook"; in stdenv.mkDerivation { name = "acextract-${lib.substring 0 8 self.inputs.acextract.lastModifiedDate}"; src = acextract;