diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2020-09-10 19:06:20 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2020-11-12 00:23:09 +0900 |
| commit | 8946ff8d71313fbe9634e242149f1e3fb6aa824b (patch) | |
| tree | aa411fb67bd96cbcda21160090dc8cd1398e7653 | |
| parent | ddd17201abbec8bf04e55164b995eb148ae94b48 (diff) | |
| download | nixpkgs-8946ff8d71313fbe9634e242149f1e3fb6aa824b.tar nixpkgs-8946ff8d71313fbe9634e242149f1e3fb6aa824b.tar.gz nixpkgs-8946ff8d71313fbe9634e242149f1e3fb6aa824b.tar.bz2 nixpkgs-8946ff8d71313fbe9634e242149f1e3fb6aa824b.tar.lz nixpkgs-8946ff8d71313fbe9634e242149f1e3fb6aa824b.tar.xz nixpkgs-8946ff8d71313fbe9634e242149f1e3fb6aa824b.tar.zst nixpkgs-8946ff8d71313fbe9634e242149f1e3fb6aa824b.zip | |
darwin/darwin-stubs: init
| -rw-r--r-- | pkgs/os-specific/darwin/darwin-stubs/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/darwin-packages.nix | 2 |
3 files changed, 28 insertions, 4 deletions
diff --git a/pkgs/os-specific/darwin/darwin-stubs/default.nix b/pkgs/os-specific/darwin/darwin-stubs/default.nix new file mode 100644 index 00000000000..f7f083e32f4 --- /dev/null +++ b/pkgs/os-specific/darwin/darwin-stubs/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "darwin-stubs"; + version = "10.12"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "darwin-stubs"; + rev = "80b3d4a57d3454c975eefd984c804dbd76f04ef2"; + sha256 = "0sslg4rmskms8ixixv1gvnrvvvmn723vbfjj6mcn24fj2ncg38y7"; + }; + + dontBuild = true; + + installPhase = '' + mkdir $out + cp -vr stubs/$version/* $out + ''; +} diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index fbd5f1cf3f0..f07b1ee73b8 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -301,7 +301,8 @@ in rec { darwin = super.darwin // { inherit (darwin) - binutils dyld Libsystem xnu configd ICU libdispatch libclosure launchd CF; + binutils dyld Libsystem xnu configd ICU libdispatch libclosure + launchd CF darwin-stubs; }; }; in with prevStage; stageFun 2 prevStage { @@ -345,7 +346,8 @@ in rec { darwin = super.darwin // { inherit (darwin) - dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale; + dyld Libsystem xnu configd libdispatch libclosure launchd libiconv + locale darwin-stubs; }; }; in with prevStage; stageFun 3 prevStage { @@ -403,7 +405,7 @@ in rec { in { inherit tools libraries; } // tools // libraries); darwin = super.darwin // rec { - inherit (darwin) dyld Libsystem libiconv locale; + inherit (darwin) dyld Libsystem libiconv locale darwin-stubs; CF = super.darwin.CF.override { inherit libxml2; @@ -502,7 +504,7 @@ in rec { inherit cc; darwin = super.darwin // { - inherit (prevStage.darwin) CF; + inherit (prevStage.darwin) CF darwin-stubs; xnu = super.darwin.xnu.override { inherit (prevStage) python3; }; }; }); diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index affb4ae92c1..91f694b40bb 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -41,6 +41,8 @@ in DarwinTools = callPackage ../os-specific/darwin/DarwinTools { }; + darwin-stubs = callPackage ../os-specific/darwin/darwin-stubs { }; + maloader = callPackage ../os-specific/darwin/maloader { inherit (darwin) opencflite; }; |