treewide: unpin apple-sdk_11 a-c
This commit is contained in:
@@ -6,7 +6,6 @@
|
||||
pkg-config,
|
||||
openssl,
|
||||
pcsclite,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -31,12 +30,9 @@ rustPlatform.buildRustPackage rec {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
openssl
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "YubiKey plugin for age";
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
wayland,
|
||||
xdg-utils,
|
||||
|
||||
apple-sdk_11,
|
||||
}:
|
||||
let
|
||||
rpathLibs =
|
||||
@@ -65,11 +64,7 @@ rustPlatform.buildRustPackage rec {
|
||||
scdoc
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
rpathLibs
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
buildInputs = rpathLibs;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
||||
@@ -4,12 +4,9 @@
|
||||
buildGoModule,
|
||||
fetchzip,
|
||||
pkg-config,
|
||||
libicns,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
desktopToDarwinBundle,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
wayland,
|
||||
libxkbcommon,
|
||||
vulkan-headers,
|
||||
@@ -44,23 +41,15 @@ buildGoModule rec {
|
||||
desktopToDarwinBundle
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
[
|
||||
apple-sdk_11
|
||||
# metal dependencies require 10.13 or newer
|
||||
(darwinMinVersionHook "10.13")
|
||||
]
|
||||
else
|
||||
[
|
||||
wayland
|
||||
libxkbcommon
|
||||
vulkan-headers
|
||||
libGL
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXfixes
|
||||
];
|
||||
buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
wayland
|
||||
libxkbcommon
|
||||
vulkan-headers
|
||||
libGL
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXfixes
|
||||
];
|
||||
|
||||
# Got different result in utf8 char length?
|
||||
checkFlags = [ "-skip=^TestClearAfter$" ];
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
SDL2,
|
||||
alsa-lib,
|
||||
apple-sdk_11,
|
||||
autoPatchelfHook,
|
||||
fetchFromGitHub,
|
||||
gtk3,
|
||||
@@ -67,9 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libpulseaudio
|
||||
openal
|
||||
udev
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
appendRunpaths = [ (lib.makeLibraryPath [ vulkan-loader ]) ];
|
||||
|
||||
@@ -52,7 +52,6 @@
|
||||
wavpack,
|
||||
wxGTK32,
|
||||
gtk3,
|
||||
apple-sdk_11,
|
||||
libpng,
|
||||
libjpeg,
|
||||
}:
|
||||
@@ -144,7 +143,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
util-linux
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
libpng
|
||||
libjpeg
|
||||
];
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
SDL2_mixer,
|
||||
libpng,
|
||||
darwin,
|
||||
apple-sdk_11,
|
||||
libicns,
|
||||
imagemagick,
|
||||
}:
|
||||
@@ -37,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
libpng
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
];
|
||||
|
||||
installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
fetchFromGitHub,
|
||||
autoAddDriverRunpath,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -28,10 +26,6 @@ rustPlatform.buildRustPackage rec {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage target/tmp/bottom/manpage/btm.1
|
||||
installShellCompletion \
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
bruno,
|
||||
pkg-config,
|
||||
pango,
|
||||
apple-sdk_11,
|
||||
testers,
|
||||
bruno-cli,
|
||||
}:
|
||||
@@ -28,14 +26,9 @@ buildNpmPackage {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
pango
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# fix for: https://github.com/NixOS/nixpkgs/issues/272156
|
||||
apple-sdk_11
|
||||
];
|
||||
buildInputs = [
|
||||
pango
|
||||
];
|
||||
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
cairo,
|
||||
pango,
|
||||
npm-lockfile-fix,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
@@ -43,16 +42,11 @@ buildNpmPackage rec {
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
pixman
|
||||
cairo
|
||||
pango
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# fix for: https://github.com/NixOS/nixpkgs/issues/272156
|
||||
apple-sdk_11
|
||||
];
|
||||
buildInputs = [
|
||||
pixman
|
||||
cairo
|
||||
pango
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
|
||||
@@ -2,9 +2,7 @@
|
||||
lib,
|
||||
SDL2,
|
||||
alsa-lib,
|
||||
apple-sdk_11,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
gtk3,
|
||||
gtksourceview3,
|
||||
libX11,
|
||||
@@ -69,8 +67,7 @@ stdenv.mkDerivation {
|
||||
alsa-lib
|
||||
openal
|
||||
libpulseaudio
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
];
|
||||
|
||||
makeFlags =
|
||||
[
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -31,8 +30,6 @@ rustPlatform.buildRustPackage rec {
|
||||
# assumes the target is x86_64-unknown-linux-gnu
|
||||
"--skip simple_project::it_checks_okay_project_correctly";
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo subcommand to check rust documentation for broken links";
|
||||
homepage = "https://github.com/deadlinks/cargo-deadlinks";
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ];
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
|
||||
preCheck = "HOME=$(mktemp -d)";
|
||||
|
||||
checkFlags = [
|
||||
|
||||
@@ -10,8 +10,6 @@
|
||||
libseccomp,
|
||||
pps-tools,
|
||||
nixosTests,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -40,10 +38,6 @@ stdenv.mkDerivation rec {
|
||||
libcap
|
||||
libseccomp
|
||||
pps-tools
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "10.13")
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
yaml-cpp,
|
||||
ncurses,
|
||||
file,
|
||||
apple-sdk_11,
|
||||
libutil,
|
||||
sigtool,
|
||||
nixosTests,
|
||||
@@ -73,7 +72,6 @@ stdenv.mkDerivation (final: {
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
libutil
|
||||
];
|
||||
|
||||
|
||||
@@ -12,9 +12,6 @@
|
||||
SDL2,
|
||||
SDL2_mixer,
|
||||
timidity,
|
||||
# Darwin dependencies
|
||||
libiconv,
|
||||
apple-sdk_11,
|
||||
# Update
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -60,8 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
timidity
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-Wno-dev" ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user