treewide: unpin apple-sdk_11
This commit is contained in:
parent
013bcf290f
commit
1b884f28bf
@ -32,7 +32,6 @@
|
||||
qtnetworkauth,
|
||||
qttools,
|
||||
nixosTests,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -127,9 +126,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
qtwayland
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
postInstall =
|
||||
|
@ -19,7 +19,6 @@
|
||||
wayland,
|
||||
gobject-introspection,
|
||||
xorg,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
let
|
||||
rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
@ -94,7 +93,6 @@ rustPlatform.buildRustPackage rec {
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libobjc
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
postInstall =
|
||||
|
@ -1,6 +1,5 @@
|
||||
{
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
@ -90,8 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
|
||||
++ lib.optional enableWayland wayland
|
||||
++ lib.optional enableVncRenderer libvncserver
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
++ lib.optional enableVncRenderer libvncserver;
|
||||
|
||||
cmakeFlags =
|
||||
lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF"
|
||||
|
@ -11,11 +11,11 @@
|
||||
docbook_xml_dtd_45,
|
||||
docbook_xsl,
|
||||
libxslt,
|
||||
apple-sdk_11,
|
||||
apple-sdk,
|
||||
}:
|
||||
|
||||
let
|
||||
xnu = apple-sdk_11.sourceRelease "xnu";
|
||||
xnu = apple-sdk.sourceRelease "xnu";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lsyncd";
|
||||
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
docbook_xml_dtd_45
|
||||
docbook_xsl
|
||||
libxslt
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/axkibe/lsyncd";
|
||||
|
@ -5,8 +5,6 @@
|
||||
zlib,
|
||||
ncurses,
|
||||
libiconv,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -22,8 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libiconv
|
||||
ncurses
|
||||
zlib
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "11.0")
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
@ -5,7 +5,6 @@
|
||||
cmake,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
curl,
|
||||
openssl,
|
||||
buildPackages,
|
||||
@ -36,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin then [ apple-sdk_11 ] else [ openssl ]);
|
||||
buildInputs = [ curl ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
|
||||
|
||||
preFixup = lib.optionalString canRunCmd ''
|
||||
installShellCompletion --cmd gix \
|
||||
|
@ -1,8 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
glibcLocales,
|
||||
# The GraalVM derivation to use
|
||||
graalvmDrv,
|
||||
@ -35,8 +33,6 @@ let
|
||||
extraArgs = builtins.removeAttrs args [
|
||||
"lib"
|
||||
"stdenv"
|
||||
"apple-sdk_11"
|
||||
"darwinMinVersionHook"
|
||||
"glibcLocales"
|
||||
"jar"
|
||||
"dontUnpack"
|
||||
@ -60,11 +56,6 @@ stdenv.mkDerivation (
|
||||
removeReferencesTo
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "11.0")
|
||||
];
|
||||
|
||||
nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ];
|
||||
|
||||
buildPhase =
|
||||
|
@ -4,7 +4,6 @@
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
libiconv,
|
||||
apple-sdk_11,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -22,7 +21,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
# Compilation during tests fails if this env var is not set.
|
||||
|
@ -8,7 +8,6 @@
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
apple-sdk_11,
|
||||
curl,
|
||||
freetype,
|
||||
libGLU,
|
||||
@ -87,9 +86,6 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libX11
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
]
|
||||
);
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,9 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
apple-sdk_11,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
}:
|
||||
@ -38,8 +36,6 @@ rustPlatform.buildRustPackage {
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ];
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = {
|
||||
|
@ -7,7 +7,6 @@
|
||||
removeReferencesTo,
|
||||
autoAddDriverRunpath,
|
||||
apple-sdk_15,
|
||||
darwinMinVersionHook,
|
||||
versionCheckHook,
|
||||
rocmPackages,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_15
|
||||
(darwinMinVersionHook "10.15")
|
||||
];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
Loading…
Reference in New Issue
Block a user