Skip to content

Commit dd0f03a

Browse files
booxterbooxter
committed
treewide: remove usage of deprecated apple_sdk framework stubs
They are not doing anything right now. This is in preparation for their complete removal from the tree. Note: several changes that affect the derivation inputs (e.g. removal of references to stub paths in build instructions) were left out. They will be cleaned up the next iteration and will require special care. Note: this PR is a result of a mix of ugly regex (not AST) based automation and some manual labor. For reference, the regex automation part was hacked in: https://github.com/booxter/nix-clean-apple_sdk Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
1 parent 5ec4cb1 commit dd0f03a

File tree

1,173 files changed

+2736
-10515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,173 files changed

+2736
-10515
lines changed

‎doc/languages-frameworks/beam.section.md‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -377,14 +377,7 @@ let
377377
378378
inputs =
379379
basePackages
380-
++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]
381-
++ lib.optionals stdenv.hostPlatform.isDarwin (
382-
with darwin.apple_sdk.frameworks;
383-
[
384-
CoreFoundation
385-
CoreServices
386-
]
387-
);
380+
++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ];
388381
389382
# define shell startup command
390383
hooks = ''

‎pkgs/applications/audio/cd-discid/default.nix‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
fetchurl,
33
lib,
44
stdenv,
5-
IOKit ? null,
65
}:
76

87
stdenv.mkDerivation rec {
@@ -19,8 +18,6 @@ stdenv.mkDerivation rec {
1918
"INSTALL=install"
2019
];
2120

22-
buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit;
23-
2421
meta = with lib; {
2522
homepage = "http://linukz.org/cd-discid.shtml";
2623
license = licenses.gpl2Plus;

‎pkgs/applications/audio/chuck/default.nix‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@
99
which,
1010
DarwinTools,
1111
xcbuild,
12-
AppKit,
13-
Carbon,
14-
CoreAudio,
15-
CoreMIDI,
16-
CoreServices,
17-
Kernel,
18-
MultitouchSupport,
1912
}:
2013

2114
stdenv.mkDerivation rec {
@@ -38,18 +31,7 @@ stdenv.mkDerivation rec {
3831
xcbuild
3932
];
4033

41-
buildInputs =
42-
[ libsndfile ]
43-
++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib
44-
++ lib.optionals stdenv.hostPlatform.isDarwin [
45-
AppKit
46-
Carbon
47-
CoreAudio
48-
CoreMIDI
49-
CoreServices
50-
Kernel
51-
MultitouchSupport
52-
];
34+
buildInputs = [ libsndfile ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
5335

5436
patches = [ ./darwin-limits.patch ];
5537

‎pkgs/applications/audio/cmus/default.nix‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
ncurses,
77
pkg-config,
88
libiconv,
9-
CoreAudio,
10-
AudioUnit,
11-
VideoToolbox,
129

1310
alsaSupport ? stdenv.hostPlatform.isLinux,
1411
alsa-lib ? null,
@@ -152,9 +149,6 @@ stdenv.mkDerivation rec {
152149
[ ncurses ]
153150
++ lib.optionals stdenv.hostPlatform.isDarwin [
154151
libiconv
155-
CoreAudio
156-
AudioUnit
157-
VideoToolbox
158152
]
159153
++ lib.flatten (lib.concatMap (a: a.deps) opts);
160154

‎pkgs/applications/audio/csound/default.nix‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
bison,
1010
boost,
1111
gettext,
12-
Accelerate,
13-
AudioUnit,
14-
CoreAudio,
15-
CoreMIDI,
1612
portaudio,
1713
alsa-lib ? null,
1814
libpulseaudio ? null,
@@ -61,10 +57,6 @@ stdenv.mkDerivation {
6157
boost
6258
]
6359
++ lib.optionals stdenv.hostPlatform.isDarwin [
64-
Accelerate
65-
AudioUnit
66-
CoreAudio
67-
CoreMIDI
6860
portaudio
6961
]
7062
++ lib.optionals stdenv.hostPlatform.isLinux (

‎pkgs/applications/audio/espeak-ng/default.nix‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
pcaudiolib,
1818
sonicSupport ? true,
1919
sonic,
20-
CoreAudio,
21-
AudioToolbox,
22-
AudioUnit,
2320
alsa-plugins,
2421
makeWrapper,
2522
}:
@@ -63,12 +60,7 @@ stdenv.mkDerivation rec {
6360
buildInputs =
6461
lib.optional mbrolaSupport mbrola
6562
++ lib.optional pcaudiolibSupport pcaudiolib
66-
++ lib.optional sonicSupport sonic
67-
++ lib.optionals stdenv.hostPlatform.isDarwin [
68-
CoreAudio
69-
AudioToolbox
70-
AudioUnit
71-
];
63+
++ lib.optional sonicSupport sonic;
7264

7365
# touch ChangeLog to avoid below error on darwin:
7466
# Makefile.am: error: required file './ChangeLog.md' not found

‎pkgs/applications/audio/ft2-clone/default.nix‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
alsa-lib,
88
SDL2,
99
libiconv,
10-
CoreAudio,
11-
CoreMIDI,
12-
CoreServices,
13-
Cocoa,
1410
}:
1511

1612
stdenv.mkDerivation rec {
@@ -30,10 +26,6 @@ stdenv.mkDerivation rec {
3026
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
3127
++ lib.optionals stdenv.hostPlatform.isDarwin [
3228
libiconv
33-
CoreAudio
34-
CoreMIDI
35-
CoreServices
36-
Cocoa
3729
];
3830

3931
passthru.tests = {

‎pkgs/applications/audio/grandorgue/default.nix‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
libicns,
1717
yaml-cpp,
1818
makeWrapper,
19-
Cocoa,
2019
includeDemo ? true,
2120
}:
2221

@@ -54,7 +53,6 @@ stdenv.mkDerivation rec {
5453
alsa-lib
5554
udev
5655
]
57-
++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]
5856
++ lib.optional jackaudioSupport libjack2;
5957

6058
cmakeFlags =

‎pkgs/applications/audio/listenbrainz-mpd/default.nix‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
openssl,
88
libiconv,
99
sqlite,
10-
Security,
11-
SystemConfiguration,
12-
CoreFoundation,
1310
installShellFiles,
1411
asciidoctor,
1512
}:
@@ -41,9 +38,6 @@ rustPlatform.buildRustPackage rec {
4138
if stdenv.hostPlatform.isDarwin then
4239
[
4340
libiconv
44-
Security
45-
SystemConfiguration
46-
CoreFoundation
4741
]
4842
else
4943
[

‎pkgs/applications/audio/littlegptracker/default.nix‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
SDL2,
66
python3,
77
jack2,
8-
Foundation,
98
alsa-lib,
109
pkg-config,
1110
}:
@@ -31,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
3130
buildInputs =
3231
[ SDL2 ]
3332
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform alsa-lib) alsa-lib
34-
++ lib.optional stdenv.hostPlatform.isDarwin Foundation
3533
++ lib.optional stdenv.hostPlatform.isLinux jack2;
3634

3735
preBuild = ''

0 commit comments

Comments
 (0)