CalvinBackup/apple-internals
1
0
Fork 0
mirror of https://github.com/mroi/apple-internals.git synced 2026-02-12 09:02:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

flake: update nixpkgs

Browse Source 
stdenv now sets DEVELOPER_DIR and SDKROOT to a Nixpkgs-internal SDK,
unset if we want the platform Xcode SDK
This commit is contained in:
Michael Roitzsch
2024-12-27 08:52:37 +01:00
parent c9193777b2
commit ac261dd12c
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@@ -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": {

12
flake.nix
View File

@@ -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