Merge staging-next into staging
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation }:
|
||||
{ lib, appleDerivation }:
|
||||
|
||||
appleDerivation {
|
||||
dontBuild = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation }:
|
||||
{ lib, appleDerivation }:
|
||||
|
||||
appleDerivation {
|
||||
installPhase = ''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation }:
|
||||
{ lib, appleDerivation }:
|
||||
|
||||
appleDerivation {
|
||||
prePatch = ''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, IOKitSrcs, xnu, darwin-stubs }:
|
||||
{ lib, appleDerivation, IOKitSrcs, xnu, darwin-stubs }:
|
||||
|
||||
# Someday it'll make sense to split these out into their own packages, but today is not that day.
|
||||
appleDerivation {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, developer_cmds }:
|
||||
{ lib, appleDerivation, developer_cmds }:
|
||||
|
||||
appleDerivation {
|
||||
buildInputs = [ developer_cmds ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo
|
||||
{ lib, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo
|
||||
, dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto
|
||||
, copyfile, removefile, libresolv, Libnotify, libplatform, libpthread
|
||||
, mDNSResponder, launchd, libutil, hfs, darling, darwin-stubs }:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc
|
||||
{ lib, appleDerivation, fetchzip, bsdmake, perl, flex, yacc
|
||||
}:
|
||||
|
||||
# this derivation sucks
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, xcbuild, ncurses, libutil }:
|
||||
{ lib, appleDerivation, xcbuild, ncurses, libutil }:
|
||||
|
||||
appleDerivation {
|
||||
# We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation }:
|
||||
{ lib, appleDerivation }:
|
||||
|
||||
appleDerivation {
|
||||
dontBuild = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, xcbuildHook }:
|
||||
{ lib, appleDerivation, xcbuildHook }:
|
||||
|
||||
appleDerivation {
|
||||
nativeBuildInputs = [ xcbuildHook ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, yacc, flex }:
|
||||
{ lib, appleDerivation, yacc, flex }:
|
||||
|
||||
appleDerivation {
|
||||
nativeBuildInputs = [ yacc flex ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, makeWrapper }:
|
||||
{ lib, appleDerivation, makeWrapper }:
|
||||
|
||||
appleDerivation {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, xcbuildHook, llvmPackages }:
|
||||
{ lib, appleDerivation, xcbuildHook, llvmPackages }:
|
||||
|
||||
appleDerivation {
|
||||
nativeBuildInputs = [ xcbuildHook ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, xcbuildHook
|
||||
{ lib, appleDerivation, xcbuildHook
|
||||
, Libc, xnu, libutil }:
|
||||
|
||||
appleDerivation {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation }:
|
||||
{ lib, appleDerivation }:
|
||||
|
||||
appleDerivation {
|
||||
installPhase = ''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }:
|
||||
{ lib, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }:
|
||||
|
||||
appleDerivation {
|
||||
nativeBuildInputs = [ xcbuildHook ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, libdispatch, xnu }:
|
||||
{ lib, appleDerivation, libdispatch, xnu }:
|
||||
|
||||
appleDerivation {
|
||||
propagatedBuildInputs = [ libdispatch xnu ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation }:
|
||||
{ lib, appleDerivation }:
|
||||
|
||||
appleDerivation {
|
||||
buildPhase = ":";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, xcbuildHook
|
||||
{ lib, appleDerivation, xcbuildHook
|
||||
, openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }:
|
||||
|
||||
appleDerivation {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, xcbuildHook }:
|
||||
{ lib, appleDerivation, xcbuildHook }:
|
||||
|
||||
appleDerivation {
|
||||
nativeBuildInputs = [ xcbuildHook ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }:
|
||||
{ lib, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }:
|
||||
|
||||
appleDerivation {
|
||||
nativeBuildInputs = [ xcbuildHook ];
|
||||
|
||||
Reference in New Issue
Block a user