treewide: remove usage of deprecated apple_sdk frameworks (#398707)

This commit is contained in:
Emily
2025-04-20 01:46:03 +01:00
committed by GitHub
1173 changed files with 2734 additions and 10513 deletions
+1 -8
View File
@@ -377,14 +377,7 @@ let
inputs =
basePackages
++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]
++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
[
CoreFoundation
CoreServices
]
);
++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ];
# define shell startup command
hooks = ''
@@ -2,7 +2,6 @@
fetchurl,
lib,
stdenv,
IOKit ? null,
}:
stdenv.mkDerivation rec {
@@ -19,8 +18,6 @@ stdenv.mkDerivation rec {
"INSTALL=install"
];
buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit;
meta = with lib; {
homepage = "http://linukz.org/cd-discid.shtml";
license = licenses.gpl2Plus;
+1 -19
View File
@@ -9,13 +9,6 @@
which,
DarwinTools,
xcbuild,
AppKit,
Carbon,
CoreAudio,
CoreMIDI,
CoreServices,
Kernel,
MultitouchSupport,
}:
stdenv.mkDerivation rec {
@@ -38,18 +31,7 @@ stdenv.mkDerivation rec {
xcbuild
];
buildInputs =
[ libsndfile ]
++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
Carbon
CoreAudio
CoreMIDI
CoreServices
Kernel
MultitouchSupport
];
buildInputs = [ libsndfile ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
patches = [ ./darwin-limits.patch ];
-6
View File
@@ -6,9 +6,6 @@
ncurses,
pkg-config,
libiconv,
CoreAudio,
AudioUnit,
VideoToolbox,
alsaSupport ? stdenv.hostPlatform.isLinux,
alsa-lib ? null,
@@ -152,9 +149,6 @@ stdenv.mkDerivation rec {
[ ncurses ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
CoreAudio
AudioUnit
VideoToolbox
]
++ lib.flatten (lib.concatMap (a: a.deps) opts);
@@ -9,10 +9,6 @@
bison,
boost,
gettext,
Accelerate,
AudioUnit,
CoreAudio,
CoreMIDI,
portaudio,
alsa-lib ? null,
libpulseaudio ? null,
@@ -61,10 +57,6 @@ stdenv.mkDerivation {
boost
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Accelerate
AudioUnit
CoreAudio
CoreMIDI
portaudio
]
++ lib.optionals stdenv.hostPlatform.isLinux (
@@ -17,9 +17,6 @@
pcaudiolib,
sonicSupport ? true,
sonic,
CoreAudio,
AudioToolbox,
AudioUnit,
alsa-plugins,
makeWrapper,
}:
@@ -63,12 +60,7 @@ stdenv.mkDerivation rec {
buildInputs =
lib.optional mbrolaSupport mbrola
++ lib.optional pcaudiolibSupport pcaudiolib
++ lib.optional sonicSupport sonic
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreAudio
AudioToolbox
AudioUnit
];
++ lib.optional sonicSupport sonic;
# touch ChangeLog to avoid below error on darwin:
# Makefile.am: error: required file './ChangeLog.md' not found
@@ -7,10 +7,6 @@
alsa-lib,
SDL2,
libiconv,
CoreAudio,
CoreMIDI,
CoreServices,
Cocoa,
}:
stdenv.mkDerivation rec {
@@ -30,10 +26,6 @@ stdenv.mkDerivation rec {
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
CoreAudio
CoreMIDI
CoreServices
Cocoa
];
passthru.tests = {
@@ -16,7 +16,6 @@
libicns,
yaml-cpp,
makeWrapper,
Cocoa,
includeDemo ? true,
}:
@@ -54,7 +53,6 @@ stdenv.mkDerivation rec {
alsa-lib
udev
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]
++ lib.optional jackaudioSupport libjack2;
cmakeFlags =
@@ -7,9 +7,6 @@
openssl,
libiconv,
sqlite,
Security,
SystemConfiguration,
CoreFoundation,
installShellFiles,
asciidoctor,
}:
@@ -41,9 +38,6 @@ rustPlatform.buildRustPackage rec {
if stdenv.hostPlatform.isDarwin then
[
libiconv
Security
SystemConfiguration
CoreFoundation
]
else
[
@@ -5,7 +5,6 @@
SDL2,
python3,
jack2,
Foundation,
alsa-lib,
pkg-config,
}:
@@ -31,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs =
[ SDL2 ]
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform alsa-lib) alsa-lib
++ lib.optional stdenv.hostPlatform.isDarwin Foundation
++ lib.optional stdenv.hostPlatform.isLinux jack2;
preBuild = ''
@@ -8,7 +8,6 @@
libXrandr,
pkg-config,
python3,
Cocoa,
}:
stdenv.mkDerivation rec {
pname = "master_me";
@@ -28,7 +27,6 @@ stdenv.mkDerivation rec {
libGL
python3
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]
++ lib.optionals stdenv.hostPlatform.isLinux [
libX11
libXext
@@ -12,13 +12,6 @@
libXcursor,
gtk3,
ffmpeg-full,
AppKit,
Carbon,
Cocoa,
CoreAudio,
CoreMIDI,
CoreServices,
Kernel,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -49,15 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
libXinerama
libXcursor
gtk3
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
Carbon
Cocoa
CoreAudio
CoreMIDI
CoreServices
Kernel
];
installPhase =
+1 -8
View File
@@ -4,8 +4,6 @@
rustPlatform,
stdenv,
libusb1,
AppKit,
IOKit,
pkg-config,
}:
rustPlatform.buildRustPackage rec {
@@ -24,12 +22,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p minidsp -p minidsp-daemon" ];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
IOKit
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ];
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
@@ -9,8 +9,6 @@
libX11,
libXau,
libXdmcp,
Carbon,
Cocoa,
cppunit,
}:
@@ -61,10 +59,6 @@ stdenv.mkDerivation {
libX11
libXau
libXdmcp
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
Cocoa
];
checkInputs = [
-2
View File
@@ -11,7 +11,6 @@
popt,
libtool,
libiconv,
CoreServices,
# Sound sub-systems
alsaSupport ? (!stdenv.hostPlatform.isDarwin),
alsa-lib,
@@ -125,7 +124,6 @@ stdenv.mkDerivation {
++ lib.optional samplerateSupport libsamplerate
++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
CoreServices
];
configureFlags = [
@@ -10,8 +10,6 @@
withPulse ? stdenv.hostPlatform.isLinux,
libpulseaudio,
withCoreAudio ? stdenv.hostPlatform.isDarwin,
AudioUnit,
AudioToolbox,
withJack ? stdenv.hostPlatform.isUnix,
jack,
withConplay ? !stdenv.hostPlatform.isWindows,
@@ -45,8 +43,6 @@ stdenv.mkDerivation rec {
++ lib.optionals withAlsa [ alsa-lib ]
++ lib.optionals withPulse [ libpulseaudio ]
++ lib.optionals withCoreAudio [
AudioUnit
AudioToolbox
]
++ lib.optionals withJack [ jack ]
);
-2
View File
@@ -5,7 +5,6 @@
rustPlatform,
pkg-config,
wrapGAppsHook3,
CoreServices,
}:
rustPlatform.buildRustPackage rec {
@@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec {
pkg-config
wrapGAppsHook3
];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices;
preConfigure = ''
substituteInPlace lib/utils.rs \
+1 -3
View File
@@ -9,9 +9,7 @@
unstableGitUpdater,
openssl,
pkg-config,
stdenv,
yt-dlp,
Security,
}:
rustPlatform.buildRustPackage {
pname = "parrot";
@@ -36,7 +34,7 @@ rustPlatform.buildRustPackage {
buildInputs = [
libopus
openssl
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
];
postInstall = ''
wrapProgram $out/bin/parrot \
@@ -9,7 +9,6 @@
SDL2,
libX11,
libXext,
Cocoa,
utf8proc,
nix-update-script,
}:
@@ -64,8 +63,7 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
libXext
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ];
];
enableParallelBuilding = true;
+1 -7
View File
@@ -13,8 +13,6 @@
libvorbis,
libopus,
soxr,
IOKit,
AudioToolbox,
aixlog,
popl,
pulseaudioSupport ? false,
@@ -55,11 +53,7 @@ stdenv.mkDerivation rec {
openssl
]
++ lib.optional pulseaudioSupport libpulseaudio
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
++ lib.optionals stdenv.hostPlatform.isDarwin [
IOKit
AudioToolbox
];
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS";
+1 -9
View File
@@ -6,8 +6,6 @@
pkg-config,
alsa-lib,
libxmp,
AudioUnit,
CoreAudio,
}:
stdenv.mkDerivation rec {
@@ -25,13 +23,7 @@ stdenv.mkDerivation rec {
autoreconfHook
pkg-config
];
buildInputs =
[ libxmp ]
++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AudioUnit
CoreAudio
];
buildInputs = [ libxmp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
meta = with lib; {
description = "Extended module player";
@@ -7,9 +7,6 @@
makeWrapper,
webkitgtk_4_0,
zenity,
Cocoa,
Security,
WebKit,
withGui ? true,
}:
@@ -31,13 +28,7 @@ rustPlatform.buildRustPackage rec {
pkg-config
makeWrapper
];
buildInputs =
lib.optional stdenv.hostPlatform.isDarwin Security
++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0
++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [
Cocoa
WebKit
];
buildInputs = lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0;
buildNoDefaultFeatures = true;
buildFeatures = [ "doh" ] ++ lib.optional withGui "webgui";
@@ -1,10 +1,8 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
rocksdb_7_10,
Security,
}:
let
@@ -31,8 +29,6 @@ rustPlatform.buildRustPackage rec {
ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
ROCKSDB_LIB_DIR = "${rocksdb}/lib";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
passthru.updateScript = ./update.sh;
meta = with lib; {
@@ -1,6 +1,5 @@
{
cmake,
CoreFoundation,
fetchFromGitHub,
fetchurl,
lib,
@@ -11,10 +10,8 @@
protobuf,
rustPlatform,
rust-jemalloc-sys,
Security,
sqlite,
stdenv,
SystemConfiguration,
testers,
}:
@@ -59,11 +56,6 @@ rustPlatform.buildRustPackage rec {
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
openssl
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreFoundation
Security
SystemConfiguration
];
depositContractSpec = fetchurl {
@@ -16,10 +16,6 @@
unbound,
zeromq,
# darwin
CoreData,
IOKit,
trezorSupport ? true,
hidapi,
libusb1,
@@ -88,10 +84,6 @@ stdenv.mkDerivation rec {
unbound
zeromq
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
IOKit
CoreData
]
++ lib.optionals trezorSupport [
python3
hidapi
@@ -4,7 +4,6 @@
buildGoModule,
fetchFromGitHub,
libobjc,
IOKit,
}:
buildGoModule rec {
@@ -39,7 +38,6 @@ buildGoModule rec {
# Fix for usb-related segmentation faults on darwin
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
libobjc
IOKit
];
ldflags = [
@@ -10,8 +10,6 @@
rustPlatform,
rustc,
stdenv,
Security,
SystemConfiguration,
}:
let
@@ -60,13 +58,9 @@ rustPlatform.buildRustPackage rec {
];
# NOTE: jemalloc is used by default on Linux with unprefixed enabled
buildInputs =
[ openssl ]
++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Security
SystemConfiguration
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ];
checkInputs = [
cacert
@@ -3,7 +3,6 @@
fetchFromGitHub,
lib,
rustPlatform,
Security,
curl,
pkg-config,
openssl,
@@ -41,7 +40,6 @@ rustPlatform.buildRustPackage rec {
# ROCKSDB_LIB_DIR="${rocksdb}/lib";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
Security
curl
];
+3 -13
View File
@@ -4,8 +4,6 @@
fetchFromGitHub,
protobuf,
rustfmt,
stdenv,
darwin,
pkg-config,
openssl,
}:
@@ -42,10 +40,6 @@ in
rustfmt
];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
];
passthru.updateScript = updateScript;
__darwinAllowLocalNetworking = true;
@@ -70,13 +64,9 @@ in
rustfmt
];
buildInputs =
[
openssl
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration
];
buildInputs = [
openssl
];
passthru.updateScript = updateScript;
@@ -15,7 +15,6 @@
makeWrapper,
rustPlatform,
pkg-config,
Security,
stdenv,
testers,
tl-expected,
@@ -55,19 +54,15 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
pkg-config
];
buildInputs =
[
boost
db62
libevent
libsodium
tl-expected
utf8cpp
zeromq
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Security
];
buildInputs = [
boost
db62
libevent
libsodium
tl-expected
utf8cpp
zeromq
];
# Use the stdenv default phases (./configure; make) instead of the
# ones from buildRustPackage.
@@ -6,21 +6,6 @@ lib.makeScope pkgs.newScope (
inherit (self) callPackage;
inheritedArgs = {
inherit (pkgs.darwin) sigtool;
inherit (pkgs.darwin.apple_sdk.frameworks)
Accelerate
AppKit
Carbon
Cocoa
GSS
ImageCaptureCore
ImageIO
IOKit
OSAKit
Quartz
QuartzCore
WebKit
;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) UniformTypeIdentifiers;
};
in
{
@@ -810,12 +810,6 @@ let
osx-dictionary =
if pkgs.stdenv.hostPlatform.isDarwin then
super.osx-dictionary.overrideAttrs (old: {
buildInputs =
old.buildInputs
++ (with pkgs.darwin.apple_sdk.frameworks; [
CoreServices
Foundation
]);
postBuild =
(old.postBuild or "")
+ ''
@@ -114,21 +114,6 @@
"lucid"
),
# macOS dependencies for NS and macPort
Accelerate,
AppKit,
Carbon,
Cocoa,
GSS,
IOKit,
ImageCaptureCore,
ImageIO,
OSAKit,
Quartz,
QuartzCore,
UniformTypeIdentifiers,
WebKit,
# test
callPackage,
}:
@@ -372,27 +357,6 @@ mkDerivation (finalAttrs: {
]
++ lib.optionals withNS [
librsvg
AppKit
GSS
ImageIO
]
++ lib.optionals (variant == "macport") [
Accelerate
AppKit
Carbon
Cocoa
IOKit
OSAKit
Quartz
QuartzCore
WebKit
# TODO are these optional?
GSS
ImageCaptureCore
ImageIO
]
++ lib.optionals (variant == "macport" && stdenv.hostPlatform.isAarch64) [
UniformTypeIdentifiers
];
# Emacs needs to find movemail at run time, see info (emacs) Movemail
@@ -22,9 +22,6 @@
SDL2,
SDL2_image,
lua,
AppKit,
Cocoa,
Foundation,
nixosTests,
}:
@@ -48,29 +45,23 @@ stdenv.mkDerivation (finalAttrs: {
gtest
];
buildInputs =
[
curl
freetype
giflib
libjpeg
libpng
libwebp
libarchive
libX11
pixman
tinyxml-2
zlib
SDL2
SDL2_image
lua
# no v8 due to missing libplatform and libbase
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
Cocoa
Foundation
];
buildInputs = [
curl
freetype
giflib
libjpeg
libpng
libwebp
libarchive
libX11
pixman
tinyxml-2
zlib
SDL2
SDL2_image
lua
# no v8 due to missing libplatform and libbase
];
cmakeFlags = [
"-DWITH_DESKTOP_INTEGRATION=ON"
+6 -11
View File
@@ -1,6 +1,5 @@
{
fetchFromGitHub,
Foundation,
freetype,
lib,
lua5_4,
@@ -29,16 +28,12 @@ stdenv.mkDerivation rec {
pkg-config
];
buildInputs =
[
freetype
lua5_4
pcre2
SDL2
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Foundation
];
buildInputs = [
freetype
lua5_4
pcre2
SDL2
];
mesonFlags = [
"-Duse_system_lua=true"
+5 -13
View File
@@ -14,9 +14,6 @@
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/68f6d131750aa778807119e03eed70286a17b1cb/trunk/archlinux.vim";
sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c";
},
# apple frameworks
Carbon,
Cocoa,
}:
let
@@ -41,16 +38,11 @@ stdenv.mkDerivation {
gettext
pkg-config
];
buildInputs =
[
ncurses
bash
gawk
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
Cocoa
];
buildInputs = [
ncurses
bash
gawk
];
strictDeps = true;
-9
View File
@@ -30,11 +30,6 @@
makeWrapper,
wrapGAppsHook3,
# apple frameworks
CoreServices,
CoreData,
Cocoa,
Foundation,
libobjc,
features ? "huge", # One of tiny, small, normal, big or huge
@@ -196,10 +191,6 @@ stdenv.mkDerivation {
++ lib.optional (guiSupport == "gtk2") gtk2-x11
++ lib.optional (guiSupport == "gtk3") gtk3-x11
++ lib.optionals darwinSupport [
CoreServices
CoreData
Cocoa
Foundation
libobjc
]
++ lib.optional luaSupport lua
@@ -10,8 +10,6 @@
esbuild,
pkg-config,
libsecret,
stdenv,
darwin,
setDefaultServerPath ? true,
}:
@@ -39,18 +37,13 @@ let
buildInputs = [
pkgsBuildBuild.libsecret
];
nativeBuildInputs =
[
jq
moreutils
esbuild
# Required by `keytar`, which is a dependency of `vsce`.
pkg-config
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.Security
];
nativeBuildInputs = [
jq
moreutils
esbuild
# Required by `keytar`, which is a dependency of `vsce`.
pkg-config
];
# Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65
installPhase = ''
+1 -3
View File
@@ -4,8 +4,6 @@
fetchFromGitHub,
pkg-config,
openssl,
stdenv,
Security,
}:
rustPlatform.buildRustPackage rec {
@@ -26,7 +24,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
buildInputs = [ openssl ];
# disable downloading and building the tree-sitter grammars at build time
# grammars can be configured in a config file and installed with `zee --build`
@@ -3,10 +3,7 @@
stdenv,
fetchFromGitHub,
alsa-lib,
AudioUnit,
autoreconfHook,
Carbon,
Cocoa,
ffmpeg,
fluidsynth,
freetype,
@@ -86,11 +83,6 @@ stdenv.mkDerivation (finalAttrs: {
alsa-lib
libxkbfile
libXrandr
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AudioUnit
Carbon
Cocoa
];
# Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL2 subdirectory
+4 -12
View File
@@ -11,7 +11,6 @@
graphicsmagick,
libGL,
libGLU,
OpenGL,
libpng,
makeDesktopItem,
}:
@@ -46,17 +45,10 @@ stdenv.mkDerivation rec {
SDL_sound
libpng
]
++ (
if stdenv.hostPlatform.isDarwin then
[
OpenGL
]
else
[
libGL
libGLU
]
);
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
libGL
libGLU
];
# Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL subdirectory
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL_net}/include/SDL";
@@ -32,12 +32,8 @@
which,
writeScript,
zlib,
darwin,
}:
let
inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;
in
stdenv.mkDerivation rec {
pname = "mame";
version = "0.276";
@@ -105,8 +101,6 @@ stdenv.mkDerivation rec {
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libpcap
CoreAudioKit
ForceFeedback
];
nativeBuildInputs = [
@@ -1,6 +1,5 @@
{
lib,
stdenv,
cmake,
rustPlatform,
pkg-config,
@@ -9,7 +8,6 @@
gtk3,
glib,
openssl,
Security,
nix-update-script,
}:
@@ -32,7 +30,7 @@ rustPlatform.buildRustPackage rec {
glib
gtk3
openssl
] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
];
nativeBuildInputs = [
cmake
@@ -45,8 +45,6 @@
libde265Support ? true,
libde265,
fftw,
ApplicationServices,
Foundation,
testers,
}:
@@ -124,11 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional djvulibreSupport djvulibre
++ lib.optional openexrSupport openexr
++ lib.optional librsvgSupport librsvg
++ lib.optional openjpegSupport openjpeg
++ lib.optionals stdenv.hostPlatform.isDarwin [
ApplicationServices
Foundation
];
++ lib.optional openjpegSupport openjpeg;
propagatedBuildInputs =
[ fftw ]
@@ -52,8 +52,6 @@
potrace,
coreutils,
curl,
ApplicationServices,
Foundation,
testers,
nixos-icons,
perlPackages,
@@ -147,11 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
librsvg
pango
]
++ lib.optional openjpegSupport openjpeg
++ lib.optionals stdenv.hostPlatform.isDarwin [
ApplicationServices
Foundation
];
++ lib.optional openjpegSupport openjpeg;
propagatedBuildInputs =
[ curl ]
+1 -2
View File
@@ -4,7 +4,6 @@
fetchFromGitHub,
cmake,
itk,
Cocoa,
}:
stdenv.mkDerivation {
@@ -19,7 +18,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ itk ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa;
buildInputs = [ itk ];
cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ];
@@ -12,7 +12,6 @@
qttools,
xorg,
libtiff,
darwin,
}:
mkDerivation rec {
@@ -42,7 +41,7 @@ mkDerivation rec {
qtbase
xorg.libXt
libtiff
] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.AGL;
];
preConfigure = ''
NOCONFIGURE=1 ./autogen.sh
@@ -16,11 +16,6 @@
libxcb,
libxkbcommon,
wayland,
AppKit,
CoreGraphics,
CoreServices,
Foundation,
OpenGL,
}:
let
rpathLibs =
@@ -59,15 +54,7 @@ rustPlatform.buildRustPackage rec {
python3
];
buildInputs =
rpathLibs
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
CoreGraphics
CoreServices
Foundation
OpenGL
];
buildInputs = rpathLibs;
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion
+9 -14
View File
@@ -9,7 +9,6 @@
freetype,
libGL,
xorg,
AppKit,
}:
rustPlatform.buildRustPackage rec {
@@ -31,19 +30,15 @@ rustPlatform.buildRustPackage rec {
pkg-config
];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
expat
fontconfig
freetype
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
expat
fontconfig
freetype
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
];
postInstall = ''
install -Dm444 assets/epick.desktop -t $out/share/applications
@@ -11,8 +11,6 @@
# See https://github.com/NixOS/nixpkgs/pull/324022. This may change later.
vtk_9,
autoPatchelfHook,
Cocoa,
OpenGL,
python3Packages,
opencascade-occt,
assimp,
@@ -64,10 +62,6 @@ stdenv.mkDerivation rec {
assimp
fontconfig
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Cocoa
OpenGL
]
++ lib.optionals withPythonBinding [
python3Packages.python
# Using C++ header files, not Python import
@@ -17,12 +17,6 @@
libGLU,
alsa-lib,
fontconfig,
AVFoundation,
Carbon,
Cocoa,
CoreAudio,
Kernel,
OpenGL,
}:
stdenv.mkDerivation rec {
@@ -75,14 +69,6 @@ stdenv.mkDerivation rec {
alsa-lib
fontconfig
libGLU
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AVFoundation
Carbon
Cocoa
CoreAudio
Kernel
OpenGL
];
env.NIX_CFLAGS_COMPILE = toString [
@@ -47,8 +47,6 @@
libgudev,
openexr,
desktopToDarwinBundle,
AppKit,
Cocoa,
gtk-mac-integration-gtk2,
withPython ? false,
python2,
@@ -144,8 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
mypaint-brushes1
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
Cocoa
gtk-mac-integration-gtk2
]
++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -66,8 +66,6 @@
adwaita-icon-theme,
alsa-lib,
desktopToDarwinBundle,
AppKit,
Cocoa,
}:
let
@@ -202,8 +200,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
llvmPackages.openmp
AppKit
Cocoa
]
++ lib.optionals stdenv.hostPlatform.isLinux [
libgudev
@@ -17,7 +17,6 @@
gtk4,
gdk-pixbuf,
libadwaita,
Foundation,
nix-update-script,
}:
@@ -60,16 +59,12 @@ stdenv.mkDerivation (finalAttrs: {
desktop-file-utils
];
buildInputs =
[
glib
gtk4
gdk-pixbuf
libadwaita
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Foundation
];
buildInputs = [
glib
gtk4
gdk-pixbuf
libadwaita
];
passthru = {
updateScript = nix-update-script { };
@@ -8,7 +8,6 @@
withSixel ? false,
libsixel,
xorg,
AppKit,
withSki ? true,
}:
@@ -36,8 +35,7 @@ rustPlatform.buildRustPackage rec {
libX11
libXrandr
]
)
++ lib.optional stdenv.hostPlatform.isDarwin AppKit;
);
buildNoDefaultFeatures = !withSki;
buildFeatures = lib.optional withSixel "sixel";
+16 -21
View File
@@ -18,7 +18,6 @@
qtbase,
qtsvg,
qttools,
VideoDecodeAcceleration,
wrapQtAppsHook,
copyDesktopItems,
# needed to run natively on wayland
@@ -44,26 +43,22 @@ stdenv.mkDerivation rec {
copyDesktopItems
];
buildInputs =
[
boost
bzip2
ffmpeg
fftwSinglePrec
hdf5
muparser
netcdf
openssl
python3
qscintilla
qtbase
qtsvg
qttools
qtwayland
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
VideoDecodeAcceleration
];
buildInputs = [
boost
bzip2
ffmpeg
fftwSinglePrec
hdf5
muparser
netcdf
openssl
python3
qscintilla
qtbase
qtsvg
qttools
qtwayland
];
# manually create a desktop file
desktopItems = [
@@ -1,17 +1,12 @@
{
callPackage,
lowPrio,
Accelerate,
CoreGraphics,
CoreVideo,
}:
let
base3 = callPackage ./tesseract3.nix { };
base4 = callPackage ./tesseract4.nix { };
base5 = callPackage ./tesseract5.nix {
inherit Accelerate CoreGraphics CoreVideo;
};
base5 = callPackage ./tesseract5.nix { };
languages = callPackage ./languages.nix { };
in
{
@@ -12,9 +12,6 @@
libtiff,
icu,
pango,
Accelerate,
CoreGraphics,
CoreVideo,
}:
stdenv.mkDerivation rec {
@@ -35,21 +32,15 @@ stdenv.mkDerivation rec {
autoreconfHook
];
buildInputs =
[
curl
leptonica
libarchive
libpng
libtiff
icu
pango
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Accelerate
CoreGraphics
CoreVideo
];
buildInputs = [
curl
leptonica
libarchive
libpng
libtiff
icu
pango
];
passthru.updateScript = nix-update-script { };
meta = {
@@ -27,9 +27,7 @@
SDL2,
SDL2_mixer,
wayland-protocols,
Carbon,
CoreServices,
OpenCL,
callPackage,
nixosTests,
@@ -73,11 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
SDL2_mixer
]
++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols
++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
CoreServices
OpenCL
]
++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers;
cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCORESERVICES_LIB=${CoreServices}";
@@ -19,10 +19,6 @@
autoconf,
libtool,
typescript,
ApplicationServices,
Carbon,
Cocoa,
VideoToolbox,
}:
rustPlatform.buildRustPackage rec {
@@ -41,12 +37,6 @@ rustPlatform.buildRustPackage rec {
ffmpeg
x264
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
ApplicationServices
Carbon
Cocoa
VideoToolbox
]
++ lib.optionals stdenv.hostPlatform.isLinux [
dbus
libva
+1 -3
View File
@@ -6,7 +6,6 @@
autoreconfHook,
autoconf-archive,
pkg-config,
CoreAudio,
enableAlsa ? true,
alsa-lib,
enableLibao ? true,
@@ -84,8 +83,7 @@ stdenv.mkDerivation {
amrnb
amrwb
]
++ lib.optional enableLibpulseaudio libpulseaudio
++ lib.optional stdenv.hostPlatform.isDarwin CoreAudio;
++ lib.optional enableLibpulseaudio libpulseaudio;
enableParallelBuilding = true;
@@ -4,13 +4,6 @@
rustPlatform,
fetchFromGitHub,
makeWrapper,
AppKit,
CoreFoundation,
CoreGraphics,
CoreVideo,
Foundation,
Metal,
QuartzCore,
xorg,
vulkan-loader,
}:
@@ -33,16 +26,6 @@ rustPlatform.buildRustPackage rec {
makeWrapper
];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
CoreFoundation
CoreGraphics
CoreVideo
Foundation
Metal
QuartzCore
];
postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
wrapProgram $out/bin/binocle \
--suffix LD_LIBRARY_PATH : ${
+1 -2
View File
@@ -8,7 +8,6 @@
cairo,
poppler,
wxGTK,
Cocoa,
}:
stdenv.mkDerivation rec {
@@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
cairo
poppler
wxGTK
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ];
];
preConfigure = "./bootstrap";
@@ -5,8 +5,6 @@
pkg-config,
libgit2,
openssl,
stdenv,
Security,
}:
rustPlatform.buildRustPackage rec {
@@ -25,14 +23,10 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs =
[
libgit2
openssl
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Security
];
buildInputs = [
libgit2
openssl
];
useNextest = true;
+1 -15
View File
@@ -17,12 +17,6 @@
gnutar,
p7zip,
xz,
IOKit,
Carbon,
Cocoa,
AudioToolbox,
OpenGL,
System,
withTTYX ? true,
libX11,
withGUI ? true,
@@ -94,15 +88,7 @@ stdenv.mkDerivation rec {
debugpy
pcpp
]
)
++ lib.optionals stdenv.hostPlatform.isDarwin [
IOKit
Carbon
Cocoa
AudioToolbox
OpenGL
System
];
);
postPatch = ''
patchShebangs python/src/prebuild.sh
+1 -2
View File
@@ -10,7 +10,6 @@
libSM,
libICE,
which,
IOKit,
copyDesktopItems,
makeDesktopItem,
wrapGAppsHook3,
@@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
libX11
libSM
libICE
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ];
];
hardeningDisable = [ "format" ];
@@ -4,9 +4,6 @@
rustPlatform,
pkg-config,
openssl,
stdenv,
CoreServices,
Security,
}:
rustPlatform.buildRustPackage rec {
@@ -25,14 +22,9 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs =
[
openssl
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreServices
Security
];
buildInputs = [
openssl
];
meta = with lib; {
description = "Knowledge management meta-framework for geeks";
+10 -15
View File
@@ -11,7 +11,6 @@
wayland,
libGL,
openssl,
darwin,
}:
rustPlatform.buildRustPackage rec {
@@ -36,20 +35,16 @@ rustPlatform.buildRustPackage rec {
pkg-config
];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
fontconfig
xorg.libXcursor
xorg.libXi
xorg.libXrandr
xorg.libxcb
wayland
libxkbcommon
openssl
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk_11_0.frameworks.AppKit
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
fontconfig
xorg.libXcursor
xorg.libXi
xorg.libXrandr
xorg.libxcb
wayland
libxkbcommon
openssl
];
checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
# time out on darwin
@@ -6,8 +6,6 @@
pkg-config,
openssl,
libgit2,
Security,
SystemConfiguration,
}:
rustPlatform.buildRustPackage rec {
@@ -30,8 +28,6 @@ rustPlatform.buildRustPackage rec {
[ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libgit2
Security
SystemConfiguration
];
nativeBuildInputs = [ pkg-config ];
-3
View File
@@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
rustPlatform,
CoreServices,
}:
rustPlatform.buildRustPackage rec {
@@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true;
cargoHash = "sha256-+x4pOtszvdzI/zR55ezcxlS52GrWQTuBn7vbnqDTVac=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
meta = with lib; {
description = "Plain text Zettelkasten based on mdBook";
homepage = "https://github.com/mdzk-rs/mdzk/";
@@ -1,7 +1,6 @@
{
stdenv,
lib,
AppKit,
DarwinTools,
alsa-utils,
at-spi2-core,
@@ -86,9 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
flac
gitMinimal
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
AppKit
]
++ [
glew
jasper
@@ -1,9 +1,7 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
Security,
}:
rustPlatform.buildRustPackage rec {
@@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true;
cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug=";
buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
meta = with lib; {
description = "Command-line tool to generate, analyze, convert and manipulate colors";
homepage = "https://github.com/sharkdp/pastel";
@@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
rustPlatform,
Foundation,
}:
rustPlatform.buildRustPackage {
@@ -19,7 +18,6 @@ rustPlatform.buildRustPackage {
useFetchCargoVendor = true;
cargoHash = "sha256-oXOf9G0BMSbFFAsmRaAZzaquFva1i1gJ4ISqJkqSx4k=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ];
meta = with lib; {
description = "Simple CLI pomodoro timer using desktop notifications written in Rust";
@@ -11,7 +11,6 @@
cereal,
cgal,
curl,
darwin,
dbus,
eigen,
expat,
@@ -142,9 +141,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals withSystemd [
systemd
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk_11_0.frameworks.CoreWLAN
];
strictDeps = true;
-4
View File
@@ -2,8 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
Libsystem,
SystemConfiguration,
installShellFiles,
libiconv,
rustPlatform,
@@ -32,8 +30,6 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
Libsystem
SystemConfiguration
libiconv
];
+1 -3
View File
@@ -1,11 +1,9 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
openssl,
pkg-config,
Security,
}:
rustPlatform.buildRustPackage rec {
@@ -23,7 +21,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-xYtdGhuieFudfJz+LxUjP7mV8uItaIvLahCH7vBWTtg=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
buildInputs = [ openssl ];
# package does not contain tests as of v0.3.3
docCheck = false;
@@ -19,7 +19,6 @@
pyxdg,
withQuartz ? stdenv.hostPlatform.isDarwin,
ApplicationServices,
withRandr ? stdenv.hostPlatform.isLinux,
libxcb,
withDrm ? stdenv.hostPlatform.isLinux,
@@ -29,9 +28,6 @@
withGeolocation ? true,
withCoreLocation ? withGeolocation && stdenv.hostPlatform.isDarwin,
CoreLocation,
Foundation,
Cocoa,
withGeoclue ? withGeolocation && stdenv.hostPlatform.isLinux,
geoclue,
withAppIndicator ? stdenv.hostPlatform.isLinux,
@@ -99,12 +95,6 @@ let
++ lib.optional withGeoclue geoclue
++ lib.optional withDrm libdrm
++ lib.optional withVidmode libXxf86vm
++ lib.optional withQuartz ApplicationServices
++ lib.optionals withCoreLocation [
CoreLocation
Foundation
Cocoa
]
++ lib.optional withAppIndicator (
if (pname != "gammastep") then libappindicator else libayatana-appindicator
);
+1 -3
View File
@@ -4,8 +4,6 @@
fetchFromGitHub,
openssl,
pkg-config,
stdenv,
Security,
}:
rustPlatform.buildRustPackage rec {
@@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
buildInputs = [ openssl ];
meta = with lib; {
description = "Impossibly fast web search, made for static sites";
@@ -2,8 +2,6 @@
lib,
stdenv,
fetchurl,
Carbon,
Cocoa,
ffmpeg,
glib,
libGLU,
@@ -43,10 +41,6 @@ stdenv.mkDerivation rec {
gdal
wxGTK32
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
Cocoa
]
++ lib.optionals stdenv.hostPlatform.isLinux [
# TODO: libGLU doesn't build for macOS because of Mesa issues
# (#233265); is it required for anything?
@@ -27,13 +27,6 @@
xinput,
avahi-compat,
# MacOS / darwin
ApplicationServices,
Carbon,
Cocoa,
CoreServices,
ScreenSaver,
UserNotifications,
}:
stdenv.mkDerivation rec {
@@ -74,14 +67,6 @@ stdenv.mkDerivation rec {
openssl
pcre
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
ApplicationServices
Carbon
Cocoa
CoreServices
ScreenSaver
UserNotifications
]
++ lib.optionals stdenv.hostPlatform.isLinux [
util-linux
libselinux
@@ -8,7 +8,6 @@
openssl,
sqlite,
libiconv,
Security,
}:
rustPlatform.buildRustPackage rec {
@@ -35,7 +34,6 @@ rustPlatform.buildRustPackage rec {
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
Security
];
OPENSSL_NO_VENDOR = 1;
+1 -2
View File
@@ -4,7 +4,6 @@
fetchurl,
tcl,
tk,
Cocoa,
makeWrapper,
}:
@@ -20,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [
tcl
tk
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ];
];
hardeningDisable = [ "format" ];
@@ -1,12 +1,10 @@
{
lib,
stdenv,
rustPlatform,
fetchFromSourcehut,
pkg-config,
ncurses,
openssl,
Security,
}:
rustPlatform.buildRustPackage rec {
@@ -28,7 +26,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
ncurses
openssl
] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
];
meta = with lib; {
description = "Gemini Project client written in Rust with NCurses";
@@ -14,7 +14,6 @@
opusfile,
SDL2,
the-foundation,
AppKit,
zip,
enableTUI ? false,
ncurses,
@@ -53,8 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals enableTUI [
ncurses
sealcurses
]
++ lib.optional stdenv.hostPlatform.isDarwin AppKit;
];
cmakeFlags = [
(lib.cmakeBool "ENABLE_TUI" enableTUI)
@@ -3,7 +3,6 @@
stdenv,
rustPlatform,
fetchFromGitHub,
Security ? null,
versionCheckHook,
}:
@@ -21,8 +20,6 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true;
cargoHash = "sha256-6sRpsXydzKB0ZaV1HeagINgb6ol9dj3XT0+pd53QOCw=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
@@ -7,7 +7,6 @@
pkg-config,
which,
libvirt,
vmnet,
withQemu ? false,
qemu,
makeWrapper,
@@ -49,13 +48,7 @@ buildGoModule rec {
makeWrapper
];
buildInputs =
if stdenv.hostPlatform.isDarwin then
[ vmnet ]
else if stdenv.hostPlatform.isLinux then
[ libvirt ]
else
null;
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libvirt ];
buildPhase = ''
make COMMIT=${src.rev}
@@ -1,9 +1,7 @@
{
lib,
stdenv,
fetchCrate,
rustPlatform,
Security,
}:
rustPlatform.buildRustPackage rec {
@@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true;
cargoHash = "sha256-A7kD46gfXWK/OlFVMULlMa7Z9Q1it9/rhGo6pjFa38k=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
doCheck = false;
meta = with lib; {
@@ -18,8 +18,6 @@
wxGTK32,
gtk3,
xdg-utils,
CoreServices,
Security,
}:
stdenv.mkDerivation {
@@ -43,26 +41,21 @@ stdenv.mkDerivation {
wrapGAppsHook3
];
buildInputs =
[
boost
dbus
gettext
gnutls
libfilezilla
libidn
nettle
pugixml
sqlite
tinyxml
wxGTK32
gtk3
xdg-utils
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreServices
Security
];
buildInputs = [
boost
dbus
gettext
gnutls
libfilezilla
libidn
nettle
pugixml
sqlite
tinyxml
wxGTK32
gtk3
xdg-utils
];
enableParallelBuilding = true;
@@ -1,13 +1,11 @@
{
lib,
stdenv,
fetchFromGitHub,
installShellFiles,
rustPlatform,
pkg-config,
openssl,
scdoc,
Security,
which,
}:
@@ -36,7 +34,7 @@ rustPlatform.buildRustPackage rec {
scdoc
which
];
buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
buildInputs = [ openssl ];
postInstall = ''
make manual
@@ -1,13 +1,9 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
pkg-config,
openssl,
CoreServices,
Security,
SystemConfiguration,
}:
rustPlatform.buildRustPackage rec {
@@ -28,15 +24,9 @@ rustPlatform.buildRustPackage rec {
pkg-config
];
buildInputs =
[
openssl
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreServices
Security
SystemConfiguration
];
buildInputs = [
openssl
];
meta = with lib; {
description = "Twitch chat in the terminal";
@@ -4,7 +4,6 @@
rustPlatform,
fetchFromGitHub,
pkg-config,
Foundation,
dbusSupport ? stdenv.hostPlatform.isLinux,
dbus,
# rustls will be used for TLS if useOpenSSL=false
@@ -28,10 +27,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-lyjTl0kbtfQdqSqxti1181+oDVYP4U++v2JEOYvI7aM=";
nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config;
buildInputs =
lib.optionals dbusSupport [ dbus ]
++ lib.optionals useOpenSSL [ openssl ]
++ lib.optional stdenv.hostPlatform.isDarwin Foundation;
buildInputs = lib.optionals dbusSupport [ dbus ] ++ lib.optionals useOpenSSL [ openssl ];
buildFeatures = lib.optional notificationSupport "desktop-notifications";
@@ -9,7 +9,6 @@
gpgSupport ? true,
sslSupport ? true,
fetchpatch,
Foundation,
}:
assert gpgSupport -> gpgme != null;
@@ -42,10 +41,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs =
[ gtk2 ]
++ lib.optionals gpgSupport [ gpgme ]
++ lib.optionals sslSupport [ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ];
[ gtk2 ] ++ lib.optionals gpgSupport [ gpgme ] ++ lib.optionals sslSupport [ openssl ];
configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl";
@@ -1,10 +1,7 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
Security,
SystemConfiguration,
}:
rustPlatform.buildRustPackage rec {
@@ -21,11 +18,6 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true;
cargoHash = "sha256-n+ZVsdR+X7tMqZFYsjsWSUr6OkD90s44EFORqRldCNE=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
Security
SystemConfiguration
];
CARGO_CRATE_NAME = "mhost";
doCheck = false;
@@ -7,7 +7,6 @@
gsasl,
libidn,
pkg-config,
Security,
nlsSupport ? true,
idnSupport ? true,
gsaslSupport ? true,
@@ -33,8 +32,7 @@ stdenv.mkDerivation rec {
];
buildInputs =
lib.optional stdenv.hostPlatform.isDarwin Security
++ lib.optional gsaslSupport gsasl
lib.optional gsaslSupport gsasl
++ lib.optional idnSupport libidn
++ lib.optional (sslLibrary == "gnutls") gnutls
++ lib.optional (sslLibrary == "openssl") openssl;
@@ -15,7 +15,6 @@
netcat-gnu,
texinfo,
which,
Security,
withKeyring ? true,
libsecret,
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
@@ -56,14 +55,11 @@ let
"--with-libgsasl"
] ++ optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-keyring" ];
buildInputs =
[
gnutls
gsasl
libidn2
]
++ optionals stdenv.hostPlatform.isDarwin [ Security ]
++ optionals withKeyring [ libsecret ];
buildInputs = [
gnutls
gsasl
libidn2
] ++ optionals withKeyring [ libsecret ];
nativeBuildInputs = [
autoreconfHook
@@ -3,8 +3,6 @@
fetchFromGitHub,
rustPlatform,
notmuch,
stdenv,
Security,
}:
rustPlatform.buildRustPackage rec {
@@ -23,7 +21,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
notmuch
] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
];
meta = with lib; {
description = "JMAP integration for notmuch mail";
@@ -1,12 +1,9 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
pkg-config,
openssl,
CoreServices,
Security,
}:
rustPlatform.buildRustPackage {
@@ -24,12 +21,7 @@ rustPlatform.buildRustPackage {
cargoHash = "sha256-ebqUH01h4B3Aq3apSKpae8ncaFirbrZiDxjiQM9kzg4=";
nativeBuildInputs = [ pkg-config ];
buildInputs =
[ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreServices
Security
];
buildInputs = [ openssl ];
cargoBuildFlags = [ "--all" ];
@@ -23,7 +23,6 @@
dht,
libnatpmp,
libiconv,
Foundation,
# Build options
enableGTK3 ? false,
gtkmm3,
+4 -14
View File
@@ -7,9 +7,6 @@
libsamplerate,
swig,
alsa-lib,
AppKit,
CoreFoundation,
Security,
python3,
pythonSupport ? true,
runCommand,
@@ -45,17 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
python3.pkgs.wheel
];
buildInputs =
[
openssl
libsamplerate
]
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
CoreFoundation
Security
];
buildInputs = [
openssl
libsamplerate
] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
env =
lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; }
@@ -7,7 +7,6 @@
pkg-config,
gtk3,
ncurses,
darwin,
copyDesktopItems,
makeDesktopItem,
}:
@@ -30,12 +29,10 @@ stdenv.mkDerivation rec {
pkg-config
copyDesktopItems
];
buildInputs =
lib.optionals stdenv.hostPlatform.isUnix [
gtk3
ncurses
]
++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp;
buildInputs = lib.optionals stdenv.hostPlatform.isUnix [
gtk3
ncurses
];
enableParallelBuilding = true;
desktopItems = [

Some files were not shown because too many files have changed in this diff Show More