treewide: unpin apple-sdk_11 pt 4 (#370475)

This commit is contained in:
Weijia Wang
2025-01-03 15:20:03 +01:00
committed by GitHub
11 changed files with 25 additions and 64 deletions
-2
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
alsa-lib,
apple-sdk_11,
config,
dbus,
fetchFromGitHub,
@@ -50,7 +49,6 @@ rustPlatform.buildRustPackage rec {
buildInputs =
[ ncurses ]
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11
++ lib.optional stdenv.hostPlatform.isLinux openssl
++ lib.optional (withALSA || withRodio) alsa-lib
++ lib.optional withClipboard libxcb
+1 -2
View File
@@ -13,7 +13,6 @@
pkg-config,
python3,
removeReferencesTo,
apple-sdk_11,
cctools,
SDL2,
fontconfig,
@@ -81,7 +80,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
SDL2
fontconfig
rustPlatform.bindgenHook
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
];
postFixup =
let
-3
View File
@@ -3,7 +3,6 @@
stdenv,
rustPlatform,
fetchFromGitHub,
apple-sdk_11,
ntpd-rs,
installShellFiles,
pandoc,
@@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-ZB18YbCdJpuu7qTXdHgs2IgDCoc3Hs/aDn4dzXmKI8c=";
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
nativeBuildInputs = [
pandoc
installShellFiles
-6
View File
@@ -1,9 +1,7 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
apple-sdk_11,
nix-update-script,
}:
@@ -22,10 +20,6 @@ rustPlatform.buildRustPackage {
rustPlatform.bindgenHook
];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
];
cargoHash = "sha256-MHZlXmHAYIiaB6Isutqjrh45jppRzTZRSE3VqzpFBBA=";
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
-4
View File
@@ -12,7 +12,6 @@
llvm,
zlib,
zstd,
apple-sdk_11,
}:
stdenv.mkDerivation rec {
@@ -43,9 +42,6 @@ stdenv.mkDerivation rec {
]
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
elfutils
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
];
preConfigure = ''
+1 -2
View File
@@ -4,7 +4,6 @@
fetchFromGitHub,
ncurses,
perl,
apple-sdk_11,
}:
stdenv.mkDerivation rec {
@@ -21,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [
ncurses
perl
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
];
makeFlags = [
"PREFIX=$(out)"
+4 -10
View File
@@ -1,13 +1,11 @@
{
fetchFromGitHub,
lib,
stdenv,
rustPlatform,
gtk4,
pkg-config,
pango,
wrapGAppsHook4,
apple-sdk_11,
versionCheckHook,
}:
@@ -29,14 +27,10 @@ rustPlatform.buildRustPackage rec {
wrapGAppsHook4
];
buildInputs =
[
gtk4
pango
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
];
buildInputs = [
gtk4
pango
];
# Disable test_replay tests as they need a gui
preCheck = ''
-5
View File
@@ -3,8 +3,6 @@
rustPlatform,
fetchFromGitHub,
installShellFiles,
apple-sdk_11,
stdenv,
}:
rustPlatform.buildRustPackage rec {
@@ -20,9 +18,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-moRr8usrFHE8YPQnsmeKoDZPAk94qRm9cHzHBLXtGFM=";
# pizauth cannot be built with default apple-sdk_10 on x86_64-darwin, pin to 11
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
@@ -4,7 +4,6 @@
fetchFromGitHub,
cmake,
cmark,
apple-sdk_11,
extra-cmake-modules,
gamemode,
ghc_filesystem,
@@ -57,18 +56,15 @@ stdenv.mkDerivation (finalAttrs: {
stripJavaArchivesHook
];
buildInputs =
[
cmark
ghc_filesystem
kdePackages.qtbase
kdePackages.qtnetworkauth
kdePackages.quazip
tomlplusplus
zlib
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
++ lib.optional gamemodeSupport gamemode;
buildInputs = [
cmark
ghc_filesystem
kdePackages.qtbase
kdePackages.qtnetworkauth
kdePackages.quazip
tomlplusplus
zlib
] ++ lib.optional gamemodeSupport gamemode;
hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];
+10 -15
View File
@@ -15,7 +15,6 @@
sphinx,
sphinxygen,
ninja,
apple-sdk_11,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -45,20 +44,16 @@ stdenv.mkDerivation (finalAttrs: {
python3.pkgs.sphinx-lv2-theme
];
buildInputs =
[
xorg.libX11
xorg.libXcursor
xorg.libXrandr
libGL
vulkan-loader
vulkan-headers
xorg.libXext
cairo
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
];
buildInputs = [
xorg.libX11
xorg.libXcursor
xorg.libXrandr
libGL
vulkan-loader
vulkan-headers
xorg.libXext
cairo
];
meta = {
homepage = "https://github.com/lv2/pugl";
-2
View File
@@ -1,5 +1,4 @@
{
apple-sdk_11,
boost,
cmake,
dbus,
@@ -47,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qttools
zlib
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
++ lib.optionals guiSupport [ dbus ]
++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ]
++ lib.optionals trackerSearch [ python3 ];