lol

treewide: unpin apple-sdk_11 r-s

+20 -99
+1 -9
pkgs/by-name/rb/rbw/package.nix
··· 6 6 openssl, 7 7 pkg-config, 8 8 installShellFiles, 9 - darwin, 10 9 bash, 11 - apple-sdk_11, 12 10 # rbw-fzf 13 11 withFzf ? false, 14 12 fzf, ··· 39 37 installShellFiles 40 38 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; 41 39 42 - buildInputs = 43 - [ bash ] # for git-credential-rbw 44 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 45 - apple-sdk_11 # Needs _NSPasteboardTypeFileURL, can be removed once x86_64-darwin defaults to a higher SDK 46 - darwin.apple_sdk_11_0.frameworks.Security 47 - darwin.apple_sdk_11_0.frameworks.AppKit 48 - ]; 40 + buildInputs = [ bash ]; # for git-credential-rbw 49 41 50 42 preConfigure = lib.optionalString stdenv.hostPlatform.isLinux '' 51 43 export OPENSSL_INCLUDE_DIR="${openssl.dev}/include"
+1 -3
pkgs/by-name/re/rehex/package.nix
··· 14 14 lua53Packages, 15 15 perlPackages, 16 16 gtk3, 17 - apple-sdk_11, 18 17 }: 19 18 20 19 stdenv.mkDerivation rec { ··· 50 49 perl 51 50 TemplateToolkit 52 51 ]) 53 - ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ] 54 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; 52 + ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ]; 55 53 56 54 makeFlags = [ 57 55 "prefix=${placeholder "out"}"
+8 -16
pkgs/by-name/re/rerun/package.nix
··· 19 19 openssl, 20 20 vulkan-loader, 21 21 wayland, 22 - apple-sdk_11, 23 22 24 23 versionCheckHook, 25 24 ··· 63 62 rustfmt 64 63 ]; 65 64 66 - buildInputs = 67 - [ 68 - freetype 69 - glib 70 - gtk3 71 - (lib.getDev openssl) 72 - libxkbcommon 73 - vulkan-loader 74 - ] 75 - ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ] 76 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 77 - # Undefined symbols for architecture x86_64: "_NSAccessibilityTabButtonSubrole" 78 - # ld: symbol(s) not found for architecture x86_64 79 - apple-sdk_11 80 - ]; 65 + buildInputs = [ 66 + freetype 67 + glib 68 + gtk3 69 + (lib.getDev openssl) 70 + libxkbcommon 71 + vulkan-loader 72 + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ]; 81 73 82 74 addDlopenRunpaths = map (p: "${lib.getLib p}/lib") ( 83 75 lib.optionals stdenv.hostPlatform.isLinux [
-6
pkgs/by-name/re/rewatch/package.nix
··· 3 3 rustPlatform, 4 4 fetchFromGitHub, 5 5 nix-update-script, 6 - apple-sdk_11, 7 - stdenv, 8 6 }: 9 7 10 8 rustPlatform.buildRustPackage rec { ··· 19 17 }; 20 18 21 19 cargoHash = "sha256-cZTA50gm7o+vBaRNjpZI0LQkXaHIukVTBXoYMUubZgw="; 22 - 23 - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ 24 - apple-sdk_11 25 - ]; 26 20 27 21 doCheck = true; 28 22
-3
pkgs/by-name/ri/ride/package.nix
··· 12 12 copyDesktopItems, 13 13 makeDesktopItem, 14 14 electron, 15 - apple-sdk_11, 16 15 }: 17 16 18 17 buildNpmPackage rec { ··· 69 68 zip 70 69 makeWrapper 71 70 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; 72 - 73 - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; 74 71 75 72 env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; 76 73
-2
pkgs/by-name/ri/rio/package.nix
··· 17 17 libGL, 18 18 vulkan-loader, 19 19 libxkbcommon, 20 - apple-sdk_11, 21 20 22 21 withX11 ? !stdenv.hostPlatform.isDarwin, 23 22 libX11, ··· 81 80 rlinkLibs 82 81 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 83 82 darwin.libutil 84 - apple-sdk_11 # Needs _NSPasteboardTypeFileURL, can be removed once x86_64-darwin defaults to a higher SDK 85 83 ]; 86 84 87 85 outputs = [
+1 -4
pkgs/by-name/ri/ripgrep/package.nix
··· 6 6 rustPlatform, 7 7 installShellFiles, 8 8 pkg-config, 9 - apple-sdk_11, 10 9 withPCRE2 ? true, 11 10 pcre2, 12 11 }: ··· 29 28 cargoHash = "sha256-b+iA8iTYWlczBpNq9eyHrWG8LMU4WPBzaU6pQRht+yE="; 30 29 31 30 nativeBuildInputs = [ installShellFiles ] ++ lib.optional withPCRE2 pkg-config; 32 - buildInputs = 33 - lib.optional withPCRE2 pcre2 34 - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; 31 + buildInputs = lib.optional withPCRE2 pcre2; 35 32 36 33 buildFeatures = lib.optional withPCRE2 "pcre2"; 37 34
+3 -10
pkgs/by-name/ru/rucola/package.nix
··· 5 5 pkg-config, 6 6 oniguruma, 7 7 stdenv, 8 - apple-sdk_11, 9 - darwinMinVersionHook, 10 8 }: 11 9 12 10 rustPlatform.buildRustPackage rec { ··· 26 24 pkg-config 27 25 ]; 28 26 29 - buildInputs = 30 - [ 31 - oniguruma 32 - ] 33 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 34 - apple-sdk_11 35 - (darwinMinVersionHook "10.13") 36 - ]; 27 + buildInputs = [ 28 + oniguruma 29 + ]; 37 30 38 31 env = { 39 32 RUSTONIG_SYSTEM_LIBONIG = true;
-4
pkgs/by-name/sc/scopehal-apps/package.nix
··· 22 22 spirv-tools, 23 23 ffts, 24 24 moltenvk, 25 - apple-sdk_11, 26 - darwinMinVersionHook, 27 25 llvmPackages, 28 26 }: 29 27 ··· 73 71 ] 74 72 ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ] 75 73 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 76 - apple-sdk_11 77 - (darwinMinVersionHook "10.15") 78 74 moltenvk 79 75 ]; 80 76
+1 -3
pkgs/by-name/sh/shipwright/package.nix
··· 27 27 zenity, 28 28 makeWrapper, 29 29 darwin, 30 - apple-sdk_11, 31 30 libicns, 32 31 }: 33 32 stdenv.mkDerivation (finalAttrs: { ··· 94 93 libXext 95 94 libpulseaudio 96 95 zenity 97 - ] 98 - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; 96 + ]; 99 97 100 98 cmakeFlags = [ 101 99 (lib.cmakeBool "NON_PORTABLE" true)
-6
pkgs/by-name/si/signalbackup-tools/package.nix
··· 6 6 cmake, 7 7 pkg-config, 8 8 9 - apple-sdk_11, 10 - darwinMinVersionHook, 11 9 dbus, 12 10 openssl, 13 11 sqlite, ··· 35 33 sqlite 36 34 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ 37 35 dbus 38 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 39 - # Needed for `utimensat` on `x86_64-darwin` 40 - apple-sdk_11 41 - (darwinMinVersionHook "11.3") 42 36 ]; 43 37 44 38 installPhase = ''
-7
pkgs/by-name/sk/skhd/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 - apple-sdk_11, 6 - darwinMinVersionHook, 7 5 nix-update-script, 8 6 versionCheckHook, 9 7 }: ··· 17 15 rev = "v${finalAttrs.version}"; 18 16 hash = "sha256-fnkWws/g4BdHKDRhqoCpdPFUavOHdk8R7h7H1dAdAYI="; 19 17 }; 20 - 21 - buildInputs = [ 22 - apple-sdk_11 23 - (darwinMinVersionHook "10.13") 24 - ]; 25 18 26 19 makeFlags = [ "BUILD_PATH=$(out)/bin" ]; 27 20
+1 -4
pkgs/by-name/sk/skia/package.nix
··· 19 19 , xcbuild 20 20 , cctools 21 21 , zlib 22 - , apple-sdk_11 23 22 , fixDarwinDylibNames 24 23 25 24 , enableVulkan ? !stdenv.hostPlatform.isDarwin ··· 70 69 ] ++ lib.optionals enableVulkan [ 71 70 vulkan-headers 72 71 vulkan-memory-allocator 73 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 74 - apple-sdk_11 # can be removed once x86_64-darwin defaults to a newer SDK 75 - ]; 72 + ] ; 76 73 77 74 gnFlags = let 78 75 cpu = {
+4 -9
pkgs/by-name/sp/spicy-parser-generator/package.nix
··· 8 8 bison, 9 9 flex, 10 10 zlib, 11 - apple-sdk_11, 12 11 }: 13 12 14 13 stdenv.mkDerivation rec { ··· 33 32 python3 34 33 ]; 35 34 36 - buildInputs = 37 - [ 38 - flex 39 - zlib 40 - ] 41 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 42 - apple-sdk_11 43 - ]; 35 + buildInputs = [ 36 + flex 37 + zlib 38 + ]; 44 39 45 40 postPatch = '' 46 41 patchShebangs scripts tests/scripts
-4
pkgs/by-name/sp/spotify-player/package.nix
··· 15 15 dbus, 16 16 fontconfig, 17 17 libsixel, 18 - apple-sdk_11, 19 18 20 19 # build options 21 20 withStreaming ? true, ··· 74 73 openssl 75 74 dbus 76 75 fontconfig 77 - ] 78 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 79 - apple-sdk_11 # can be removed once x86_64-darwin defaults to a newer SDK 80 76 ] 81 77 ++ lib.optionals withSixel [ libsixel ] 82 78 ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ]
-9
pkgs/by-name/st/stockfish/package.nix
··· 4 4 fetchurl, 5 5 fetchFromGitHub, 6 6 apple-sdk, 7 - apple-sdk_11, 8 - darwinMinVersionHook, 9 7 }: 10 8 11 9 let ··· 63 61 "CXX=${stdenv.cc.targetPrefix}c++" 64 62 ]; 65 63 buildFlags = [ "build" ]; 66 - 67 - buildInputs = 68 - lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder apple-sdk.version "11") 69 - [ 70 - apple-sdk_11 71 - (darwinMinVersionHook "10.15") 72 - ]; 73 64 74 65 enableParallelBuilding = true; 75 66