spacebar: switch to apple-sdk_12; move to by-name (NixOS#353749)

tjni · Nov 6, 2024 · e296bdf · e296bdf
2 parents ee17399 + 18176d9
commit e296bdf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/pkgs/os-specific/darwin/spacebar/default.nix → pkgs/by-name/sp/spacebar/package.nix b/pkgs/os-specific/darwin/spacebar/default.nix → pkgs/by-name/sp/spacebar/package.nix
@@ -1,4 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge, SkyLight }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  apple-sdk_12,
+}:
 
 stdenv.mkDerivation rec {
   pname = "spacebar";
@@ -11,7 +16,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-4LiG43kPZtsm7SQ/28RaGMpYsDshCaGvc1mouPG3jFM=";
   };
 
-  buildInputs = [ Carbon Cocoa ScriptingBridge SkyLight ];
+  buildInputs = [
+    apple-sdk_12
+  ];
 
   installPhase = ''
     mkdir -p $out/bin

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -12311,11 +12311,6 @@ with pkgs;
 
   somebar = callPackage ../applications/misc/somebar { };
 
-  spacebar = callPackage ../os-specific/darwin/spacebar {
-    inherit (darwin.apple_sdk.frameworks)
-      Carbon Cocoa ScriptingBridge SkyLight;
-  };
-
   speech-denoiser = callPackage ../applications/audio/speech-denoiser { };
 
   splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot;