gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

go: propagate the apple sdk

Browse Source
This commit is contained in:
zowoq
2024-10-11 11:42:54 +10:00
parent 986659b138
commit 05cf0c40b8
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/go/1.22.nix
+2 -3
View File
@@ -4,8 +4,7 @@
, tzdata
, substituteAll
, iana-etc
, Security
, Foundation
, apple-sdk_11
, xcbuild
, mailcap
, buildPackages
@@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ]
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ apple-sdk_11 xcbuild ];
depsBuildTarget = lib.optional isCross targetCC;
pkgs/development/compilers/go/1.23.nix
+2 -3
View File
@@ -4,8 +4,7 @@
, tzdata
, substituteAll
, iana-etc
, Security
, Foundation
, apple-sdk_11
, xcbuild
, mailcap
, buildPackages
@@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ]
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ apple-sdk_11 xcbuild ];
depsBuildTarget = lib.optional isCross targetCC;
pkgs/top-level/all-packages.nix
+6 -12
View File
@@ -23900,25 +23900,19 @@ with pkgs;
buildGoModule = buildGo123Module;
buildGoPackage = buildGo123Package;
# requires a newer Apple SDK
go_1_22 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.22.nix {
inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
};
buildGo122Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix {
go_1_22 = callPackage ../development/compilers/go/1.22.nix { };
buildGo122Module = callPackage ../build-support/go/module.nix {
go = buildPackages.go_1_22;
};
buildGo122Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix {
buildGo122Package = callPackage ../build-support/go/package.nix {
go = buildPackages.go_1_22;
};
# requires a newer Apple SDK
go_1_23 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.23.nix {
inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
};
buildGo123Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix {
go_1_23 = callPackage ../development/compilers/go/1.23.nix { };
buildGo123Module = callPackage ../build-support/go/module.nix {
go = buildPackages.go_1_23;
};
buildGo123Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix {
buildGo123Package = callPackage ../build-support/go/package.nix {
go = buildPackages.go_1_23;
};