diff options
Diffstat (limited to 'pkgs/os-specific')
87 files changed, 430 insertions, 224 deletions
diff --git a/pkgs/os-specific/bsd/default.nix b/pkgs/os-specific/bsd/default.nix index a75c132b55a2..ee7158e2a8c5 100644 --- a/pkgs/os-specific/bsd/default.nix +++ b/pkgs/os-specific/bsd/default.nix @@ -1,5 +1,5 @@ { callPackages, recurseIntoAttrs }: -rec { +{ netbsd = recurseIntoAttrs (callPackages ./netbsd {}); } diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 93b6f4a62097..7370901f3193 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -38,14 +38,14 @@ let HOST_SH = "${buildPackages.bash}/bin/sh"; MACHINE_ARCH = { - "i686" = "i386"; + i686 = "i386"; }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; MACHINE = { - "x86_64" = "amd64"; - "aarch64" = "evbarm64"; - "i686" = "i386"; + x86_64 = "amd64"; + aarch64 = "evbarm64"; + i686 = "i386"; }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; @@ -79,7 +79,7 @@ let ## ## START BOOTSTRAPPING ## - makeMinimal = mkDerivation rec { + makeMinimal = mkDerivation { path = "tools/make"; sha256 = "1xbzfd4i7allrkk1if74a8ymgpizyj0gkvdigzzj37qar7la7nc1"; version = "8.0"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix index 7002f82fe561..a7b2bd7d981d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, developer_cmds }: -appleDerivation rec { +appleDerivation { buildInputs = [ developer_cmds ]; installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 7b19194be96e..99d670028032 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -3,7 +3,7 @@ , copyfile, removefile, libresolv, Libnotify, libplatform, libpthread , mDNSResponder, launchd, libutil, hfs, darling }: -appleDerivation rec { +appleDerivation { dontBuild = true; dontFixup = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 4a0180dda7ae..eadf18e028ee 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, xcbuildHook }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; # These PBXcp calls should be patched in xcbuild to allow them to diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index b2d8522f3264..21971ea2e284 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, xcbuildHook }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; patchPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index f0394a20c2cc..5de84d2a6e5d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ zlib bzip2 lzma ncurses libutil ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 9ca0f3b4e56d..82be7dc860ec 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,7 +1,7 @@ { stdenv, appleDerivation, xcbuildHook , openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ openssl_1_0_2 xnu Librpcsvc libpcap developer_cmds ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix index 5b2322915dc9..b87dadd391d2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, xcbuildHook }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; patchPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 39c903a2e7b9..03556296ca1d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -1,7 +1,7 @@ { stdenv, appleDerivation, lib , Librpcsvc, apple_sdk, pam, CF, openbsm }: -appleDerivation rec { +appleDerivation { # xcbuild fails with: # /nix/store/fc0rz62dh8vr648qi7hnqyik6zi5sqx8-xcbuild-wrapper/nix-support/setup-hook: line 1: 9083 Segmentation fault: 11 xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build # see issue facebook/xcbuild#188 diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix index cb81c2e81495..02821fe61ef9 100644 --- a/pkgs/os-specific/darwin/lsusb/default.nix +++ b/pkgs/os-specific/darwin/lsusb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.0"; pname = "lsusb"; diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/pkgs/os-specific/darwin/osxfuse/default.nix index 77e63c779b9c..e1a00c71cb85 100644 --- a/pkgs/os-specific/darwin/osxfuse/default.nix +++ b/pkgs/os-specific/darwin/osxfuse/default.nix @@ -16,7 +16,7 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "osxfuse"; inherit version; diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix index 19ab34145e80..21b0d605021d 100644 --- a/pkgs/os-specific/darwin/qes/default.nix +++ b/pkgs/os-specific/darwin/qes/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, Carbon }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qes"; version = "0.0.2"; diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index bb9dc0a03b5f..d25edff49560 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/ |