File tree Expand file tree Collapse file tree 11 files changed +12
-49
lines changed
Expand file tree Collapse file tree 11 files changed +12
-49
lines changed Original file line number Diff line number Diff line change 2828 spirv-tools ,
2929 gtest ,
3030 glew ,
31- apple-sdk_11 ,
3231} :
3332let
3433 clientExecutable = "TaterClient-DDNet" ;
Original file line number Diff line number Diff line change 77, readline
88, libxslt
99, libxcrypt
10- , apple-sdk_11
1110, docbook-xsl-nons
1211, docbook_xml_dtd_45
1312} :
@@ -34,8 +33,6 @@ stdenv.mkDerivation rec {
3433 python3
3534 readline # required to build python
3635 libxcrypt
37- ] ++ lib . optionals stdenv . hostPlatform . isDarwin [
38- apple-sdk_11
3936 ] ;
4037
4138 # otherwise the configure script fails with
Original file line number Diff line number Diff line change 11{
22 lib ,
3- stdenv ,
43 rustPlatform ,
54 fetchFromGitHub ,
65 installShellFiles ,
7- apple-sdk_11 ,
86} :
97
108rustPlatform . buildRustPackage rec {
@@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec {
2018
2119 cargoHash = "sha256-ZKaq/JqH/Y2Cs9LLnlt1Gawe4R+kvS3vpUcNK95uujk=" ;
2220
23- buildInputs = lib . optional stdenv . hostPlatform . isDarwin apple-sdk_11 ;
24-
2521 nativeBuildInputs = [ installShellFiles ] ;
2622
2723 postInstall = ''
Original file line number Diff line number Diff line change 1414 secp256k1 ,
1515 zlib ,
1616 nix-update-script ,
17- darwinMinVersionHook ,
18- apple-sdk_11 ,
1917} :
2018
2119stdenv . mkDerivation rec {
@@ -41,22 +39,16 @@ stdenv.mkDerivation rec {
4139 pkg-config
4240 ] ;
4341
44- buildInputs =
45- [
46- gperf
47- libmicrohttpd
48- libsodium
49- lz4
50- openssl
51- readline
52- secp256k1
53- zlib
54- ]
55- ++ lib . optionals stdenv . hostPlatform . isDarwin [
56- # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
57- ( darwinMinVersionHook "10.13" )
58- apple-sdk_11
59- ] ;
42+ buildInputs = [
43+ gperf
44+ libmicrohttpd
45+ libsodium
46+ lz4
47+ openssl
48+ readline
49+ secp256k1
50+ zlib
51+ ] ;
6052
6153 passthru . updateScript = nix-update-script { } ;
6254
Original file line number Diff line number Diff line change 11{
22 lib ,
33 stdenv ,
4- apple-sdk_11 ,
54 capnproto ,
65 extra-cmake-modules ,
76 fetchFromGitHub ,
@@ -45,7 +44,7 @@ rustPlatform.buildRustPackage rec {
4544 openssl
4645 rust-jemalloc-sys
4746 zlib
48- ] ++ lib . optional stdenv . hostPlatform . isDarwin apple-sdk_11 ;
47+ ] ;
4948
5049 cargoBuildFlags = [
5150 "--package"
Original file line number Diff line number Diff line change 33 stdenv ,
44 fetchFromGitHub ,
55 runtimeShell ,
6- apple-sdk_11 ,
76 cacert ,
87 cmake ,
98 cmakerc ,
@@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
4241 buildInputs = [
4342 cmakerc
4443 fmt
45- ] ++ lib . optionals stdenv . hostPlatform . isDarwin [ apple-sdk_11 ] ;
44+ ] ;
4645
4746 patches = [
4847 ./change-lock-location.patch
Original file line number Diff line number Diff line change 22 lib ,
33 rustPlatform ,
44 fetchCrate ,
5- stdenv ,
6- apple-sdk_11 ,
75} :
86
97rustPlatform . buildRustPackage rec {
@@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec {
1816
1917 cargoHash = "sha256-rYQxIttuGBGEkYkFtSBl8ce1I/Akm6FxeITJcaIeP6M=" ;
2018
21- buildInputs = lib . optionals stdenv . hostPlatform . isDarwin [ apple-sdk_11 ] ;
22-
2319 meta = with lib ; {
2420 description = "Command line utility for batch-renaming files" ;
2521 homepage = "https://www.dmulholl.com/dev/vimv.html" ;
Original file line number Diff line number Diff line change 22 lib ,
33 fetchFromGitHub ,
44 rustPlatform ,
5- stdenv ,
65 nixosTests ,
76 nix-update-script ,
87 versionCheckHook ,
9- apple-sdk_11 ,
108} :
119
1210let
@@ -29,10 +27,6 @@ rustPlatform.buildRustPackage {
2927
3028 nativeBuildInputs = [ versionCheckHook ] ;
3129
32- buildInputs = lib . optionals stdenv . hostPlatform . isDarwin [
33- apple-sdk_11
34- ] ;
35-
3630 doInstallCheck = true ;
3731
3832 checkFlags = [
Original file line number Diff line number Diff line change 44 fetchFromGitHub ,
55 zig_0_13 ,
66 callPackage ,
7- apple-sdk_11 ,
87} :
98
109stdenv . mkDerivation ( finalAttrs : {
@@ -25,8 +24,6 @@ stdenv.mkDerivation (finalAttrs: {
2524
2625 nativeBuildInputs = [ zig_0_13 . hook ] ;
2726
28- buildInputs = lib . optionals stdenv . hostPlatform . isDarwin [ apple-sdk_11 ] ;
29-
3027 postPatch = ''
3128 ln -s ${ callPackage ./deps.nix { } } $ZIG_GLOBAL_CACHE_DIR/p
3229 '' ;
Original file line number Diff line number Diff line change 44 fetchFromGitHub ,
55 zig_0_11 ,
66 nix ,
7- apple-sdk_11 ,
87} :
98
109stdenv . mkDerivation rec {
@@ -22,8 +21,6 @@ stdenv.mkDerivation rec {
2221 zig_0_11 . hook
2322 ] ;
2423
25- buildInputs = lib . optionals stdenv . hostPlatform . isDarwin [ apple-sdk_11 ] ;
26-
2724 zigBuildFlags = [
2825 "-Dnix=${ lib . getExe nix } "
2926 ] ;
You can’t perform that action at this time.
0 commit comments