alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #24252 from periklis/topic_darwin_cleanup

Browse source 
darwin: cleanup obsolete sdks
This commit is contained in:
Daiderd Jordan 2017-03-24 08:47:56 +01:00 committed by GitHub
parent f6669da3cf 6414533391
commit 6fe465f500
4 changed files with 1 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/compilers/smlnj/default.nix
View file

@ -38,7 +38,7 @@ in stdenv.mkDerivation {
'' + stdenv.lib.optionalString stdenv.isDarwin (with darwin; ''
sed -i '/^[[:space:]]*\*x86-darwin\*)$/,/^[[:space:]]*\*) ;;/ c\
\ \*x86-darwin\*)\
\ INCLFILE=${osx_sdk}/Developer/SDKs/${osx_sdk.name}/usr/include/unistd.h\
\ INCLFILE=${apple_sdk.sdk}/include/unistd.h\
\ ;;\
\ \*) ;;
' base/runtime/config/gen-posix-names.sh

45
pkgs/os-specific/darwin/command-line-tools/default.nix
View file

@ -1,45 +0,0 @@
{ stdenv, fetchurl, xar, gzip, cpio }:
let
pkg = { name, sha256 }: stdenv.mkDerivation {
inherit name;
src = fetchurl {
# Magic url found in:
# https://swscan.apple.com/content/catalogs/others/index-10.9-1.sucatalog
url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/${name}.pkg";
inherit sha256;
};
buildInputs = [ xar gzip cpio ];
phases = [ "unpackPhase" "installPhase" ];
unpackPhase = ''
xar -x -f $src
'';
installPhase = ''
start="$(pwd)"
mkdir -p $out
cd $out
cat $start/Payload | gzip -d | cpio -idm
'';
meta = with stdenv.lib; {
description = "Apple developer tools ${name}";
maintainers = with maintainers; [ copumpkin ];
platforms = platforms.darwin;
};
};
in rec {
tools = pkg {
name = "CLTools_Executables_OSX109";
sha256 = "1cjdnnjny6h0dc1cc994pgrkmsa5cvk7pi5dpkxyslyicwf260fx";
};
sdk = pkg {
name = "DevSDK_OSX109";
sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4";
};
}

25
pkgs/os-specific/darwin/osx-sdk/default.nix
View file

@ -1,25 +0,0 @@
{ stdenv }:
let
version = "10.9";
in stdenv.mkDerivation rec {
name = "MacOSX10.9.sdk";
src = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk";
unpackPhase = "true";
dontBuild = true;
installPhase = ''
mkdir -p $out/Developer/SDKs/
echo "Source is: $src"
cp -r $src $out/Developer/SDKs/
'';
meta = with stdenv.lib; {
description = "The Mac OS ${version} SDK";
maintainers = with maintainers; [ copumpkin ];
platforms = platforms.darwin;
license = licenses.unfree;
};
}

5
pkgs/top-level/all-packages.nix
View file

@ -11236,7 +11236,6 @@ with pkgs;
crda = callPackage ../os-specific/linux/crda { };
darwin = let
cmdline = callPackage ../os-specific/darwin/command-line-tools {};
apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
in apple-source-releases // rec {
cctools_cross = callPackage (forcedNativePackages.callPackage ../os-specific/darwin/cctools/port.nix {}).cross {
@ -11269,7 +11268,6 @@ with pkgs;
xcode = callPackage ../os-specific/darwin/xcode {};
osx_sdk = callPackage ../os-specific/darwin/osx-sdk {};
osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk {};
security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool {
@ -11278,9 +11276,6 @@ with pkgs;
binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; };
cmdline_sdk = cmdline.sdk;
cmdline_tools = cmdline.tools;
apple_sdk = callPackage ../os-specific/darwin/apple-sdk {};
libobjc = apple-source-releases.objc4;