Unverified Commit 2ade0ae6 authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

darwin.hfs: remove and replace with stubs (including hfsHeaders)

parent cce88cf1

pkgs/os-specific/darwin/apple-source-releases/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { 
    xnu             = if isSdk10_12 then

      applePackage "xnu" "osx-10.12.6" "sha256-C8TPQlUT3RbzAy8YnZPNtr70hpaVG9Llv0h42s3NENI=" {}

    else macosPackages_11_0_1.xnu;

    hfs             = applePackage "hfs"               "osx-10.12.6"     "sha256-eGi18HQFJrU5UHoBOE0LqO5gQ0xOf8+OJuAWQljfKE4=" {};

    adv_cmds        = callPackage ./adv_cmds/package.nix { };

    basic_cmds      = callPackage ./basic_cmds/package.nix { };

    developer_cmds  = callPackage ./developer_cmds/package.nix { };

pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
{ appleDerivation', stdenv, stdenvNoCC, lib, headersOnly ? true }:



appleDerivation' (if headersOnly then stdenvNoCC else stdenv) {

  installPhase = lib.optionalString headersOnly ''

    mkdir -p $out/include/hfs

    cp core/*.h $out/include/hfs

  '';



  appleHeaders = ''

    hfs/BTreeScanner.h

    hfs/BTreesInternal.h

    hfs/BTreesPrivate.h

    hfs/CatalogPrivate.h

    hfs/FileMgrInternal.h

    hfs/HFSUnicodeWrappers.h

    hfs/UCStringCompareData.h

    hfs/hfs.h

    hfs/hfs_alloc_trace.h

    hfs/hfs_attrlist.h

    hfs/hfs_btreeio.h

    hfs/hfs_catalog.h

    hfs/hfs_cnode.h

    hfs/hfs_cprotect.h

    hfs/hfs_dbg.h

    hfs/hfs_endian.h

    hfs/hfs_extents.h

    hfs/hfs_format.h

    hfs/hfs_fsctl.h

    hfs/hfs_hotfiles.h

    hfs/hfs_iokit.h

    hfs/hfs_journal.h

    hfs/hfs_kdebug.h

    hfs/hfs_key_roll.h

    hfs/hfs_macos_defs.h

    hfs/hfs_mount.h

    hfs/hfs_quota.h

    hfs/hfs_unistr.h

    hfs/kext-config.h

    hfs/rangelist.h

  '';



  meta = {

    # Seems nobody wants its binary, so we didn't implement building.

    broken = !headersOnly;

    platforms = lib.platforms.darwin;

  };

}

pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ bootstrap_cmds = callPackage ./bootstrap_cmds/package.nix { }; 
copyfile = applePackage' "copyfile" "173.40.2" "macos-11.0.1" "1j20909inn2iw8n51b8vk551wznfi3bhfziy8nbv08qj5lk50m04" {};

diskdev_cmds = applePackage' "diskdev_cmds" "667.40.1" "macos-11.0.1" "0wr60vyvgkbc4wyldnsqas0xss2k1fgmbdk3vnhj6v6jqa98l1ny" {};

file_cmds = applePackage' "file_cmds" "321.40.3" "macos-11.0.1" "0p077lnbcy8266m03a0fssj4214bjxh88y3qkspnzcvi0g84k43q" {};

hfs = applePackage' "hfs" "556.41.1" "macos-11.0.1" "0a0s6b12b0q07wslfifna0bj51dml9v098i4crr2m1vivnx4xj75" {};

libclosure = applePackage' "libclosure" "78" "macos-11.0.1" "0vf9n0k3m8dbprv1bf45zqg0g43bidy2i5z1v9a826bsf8lv7am7" {};

libdispatch = applePackage' "libdispatch" "1271.40.12" "macos-11.0.1" "1ck5srcjapg18vqb8wl08gacs7ndc6xr067qjn3ngx39q1jdcywz" {};

libmalloc = applePackage' "libmalloc" "317.40.8" "macos-11.0.1" "sha256-Tdhb0mq3w4Hwvp3xHB79Vr22hCOQK6h28HCsd7jvITI=" {};

pkgs/top-level/darwin-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ makeScopeWithSplicing' { 
    "dtrace"

    "dyld"

    "eap8021x"

    "hfs"

    "hfsHeaders"

  ] (mkStub apple_sdk.version);

in

impure-cmds // appleSourcePackages // stubs // {