mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
darwin.architecture: remove and replace with stubs
This commit is contained in:
parent
07272a045f
commit
fd2ae224d5
@ -1,39 +0,0 @@
|
||||
{ lib, appleDerivation', stdenvNoCC }:
|
||||
|
||||
appleDerivation' stdenvNoCC {
|
||||
dontBuild = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace '/bin/mkdir' 'mkdir' \
|
||||
--replace '/usr/bin/install' 'install'
|
||||
'';
|
||||
|
||||
installFlags = [ "EXPORT_DSTDIR=/include/architecture" ];
|
||||
|
||||
DSTROOT = "$(out)";
|
||||
|
||||
appleHeaders = ''
|
||||
architecture/alignment.h
|
||||
architecture/byte_order.h
|
||||
architecture/i386/alignment.h
|
||||
architecture/i386/asm_help.h
|
||||
architecture/i386/byte_order.h
|
||||
architecture/i386/cpu.h
|
||||
architecture/i386/desc.h
|
||||
architecture/i386/fpu.h
|
||||
architecture/i386/frame.h
|
||||
architecture/i386/io.h
|
||||
architecture/i386/pio.h
|
||||
architecture/i386/reg_help.h
|
||||
architecture/i386/sel.h
|
||||
architecture/i386/table.h
|
||||
architecture/i386/tss.h
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
@ -259,7 +259,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
|
||||
# TODO: shorten this list, we should cut down to a minimum set of bootstrap or necessary packages here.
|
||||
|
||||
inherit (self.adv_cmds) ps locale;
|
||||
architecture = applePackage "architecture" "osx-10.11.6" "sha256-cUKeMx6mOAxBSRHIdfzsrR65Qv86m7+20XvpKqVfwVI=" {};
|
||||
AvailabilityVersions = callPackage ./AvailabilityVersions/package.nix { };
|
||||
configd = applePackage "configd" "osx-10.8.5" "sha256-6I3FWNjTgds5abEcZrD++s9b+P9a2+qUf8KFAb72DwI=" {
|
||||
Security = applePackage "Security/boot.nix" "osx-10.9.5" "sha256-7qr0IamjCXCobIJ6V9KtvbMBkJDfRCy4C5eqpHJlQLI=" {};
|
||||
|
@ -7,7 +7,6 @@ Csu = applePackage' "Csu" "88" "macos-11.0.1" "1lzp9x8iv60c2h12q2s89nf49b5hvpqq4
|
||||
ICU = callPackage ./ICU/package.nix { };
|
||||
PowerManagement = applePackage' "PowerManagement" "1132.50.3" "macos-11.0.1" "1sb2nz92vdf6v3h17ry0vgw0z9zsva82lhdrhsf3k60jhfw1fi2v" {};
|
||||
adv_cmds = applePackage' "adv_cmds" "176" "macos-11.0.1" "0sskwl3jc7llbrlyd1i7qlb03yhm1xkbxd1k9xhh7f9wqhlzq31j" {};
|
||||
architecture = applePackage' "architecture" "279" "macos-11.0.1" "19s93rqr9r98qh0rlndf7kv3v4n1ifh9i539mbpsx6kbixcx8vvp" {};
|
||||
basic_cmds = applePackage' "basic_cmds" "55" "macos-11.0.1" "1913pzk376zfap2fwmrb233rkn4h4l2c65nd7s8ixvrz1r7cz0q5" {};
|
||||
bootstrap_cmds = callPackage ./bootstrap_cmds/package.nix { };
|
||||
configd = applePackage' "configd" "1109.40.9" "macos-11.0.1" "024ny63lpwzgnm8g28hh8dldvmmislmrl298n721rm0blqjhahz5" {};
|
||||
|
@ -81,6 +81,7 @@ makeScopeWithSplicing' {
|
||||
"Libsystem"
|
||||
"LibsystemCross"
|
||||
"Security"
|
||||
"architecture"
|
||||
] (mkStub apple_sdk.version);
|
||||
in
|
||||
impure-cmds // appleSourcePackages // stubs // {
|
||||
|
Loading…
Reference in New Issue
Block a user