From bfc608e30ed6f3f29ba922c79d242ef378a22edc Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Fri, 28 Jun 2024 14:48:17 +0200 Subject: [PATCH] flake: update for Xcode 16.0 --- flake.lock | 6 +++--- flake.nix | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 382fe88..d5b7294 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707205916, - "narHash": "sha256-fmRJilYGlB7VCt3XsdYxrA0u8e/K84O5xYucerUY0iM=", + "lastModified": 1719468428, + "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8cc79aa39bbc6eaedaf286ae655b224c71e02907", + "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b087b3d..befafb6 100644 --- a/flake.nix +++ b/flake.nix @@ -21,8 +21,11 @@ outputs = { self, nixpkgs, acextract, command-line, dsc-extractor, snap-util }: { packages.x86_64-darwin = let xcode = (nixpkgs.legacyPackages.x86_64-darwin.xcodeenv.composeXcodeWrapper { - version = "15.2"; - }).overrideAttrs (attrs: { __noChroot = true; }); + version = "16.0"; + }).overrideAttrs (attrs: { buildCommand = '' + # see https://github.com/NixOS/nixpkgs/pull/322641 + set +o pipefail + '' + attrs.buildCommand; }); in {