From 215b30238e606155f93af78d877f56a42795cfd5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 21:01:58 -0600 Subject: [PATCH 1/3] spacebar: format --- pkgs/os-specific/darwin/spacebar/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/spacebar/default.nix b/pkgs/os-specific/darwin/spacebar/default.nix index 051bbfc46c15d..3fa7ccacf77dc 100644 --- a/pkgs/os-specific/darwin/spacebar/default.nix +++ b/pkgs/os-specific/darwin/spacebar/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge, SkyLight }: +{ + lib, + stdenv, + fetchFromGitHub, + Carbon, + Cocoa, + ScriptingBridge, + SkyLight, +}: stdenv.mkDerivation rec { pname = "spacebar"; @@ -11,7 +19,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-4LiG43kPZtsm7SQ/28RaGMpYsDshCaGvc1mouPG3jFM="; }; - buildInputs = [ Carbon Cocoa ScriptingBridge SkyLight ]; + buildInputs = [ + Carbon + Cocoa + ScriptingBridge + SkyLight + ]; installPhase = '' mkdir -p $out/bin From b909deee7fd9682cb4584e727e2fb3b3348ddc99 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 21:02:55 -0600 Subject: [PATCH 2/3] spacebar: switch to apple-sdk_12 --- pkgs/os-specific/darwin/spacebar/default.nix | 10 ++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/darwin/spacebar/default.nix b/pkgs/os-specific/darwin/spacebar/default.nix index 3fa7ccacf77dc..535b8d5876d81 100644 --- a/pkgs/os-specific/darwin/spacebar/default.nix +++ b/pkgs/os-specific/darwin/spacebar/default.nix @@ -2,10 +2,7 @@ lib, stdenv, fetchFromGitHub, - Carbon, - Cocoa, - ScriptingBridge, - SkyLight, + apple-sdk_12, }: stdenv.mkDerivation rec { @@ -20,10 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - Carbon - Cocoa - ScriptingBridge - SkyLight + apple-sdk_12 ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 324161235eb43..b6ac30d7930e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12334,8 +12334,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 { }; From 18176d9f116ffcae457f9a4b4a339e30f5c7e775 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 21:06:04 -0600 Subject: [PATCH 3/3] spacebar: move to by-name --- .../spacebar/default.nix => by-name/sp/spacebar/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 3 deletions(-) rename pkgs/{os-specific/darwin/spacebar/default.nix => by-name/sp/spacebar/package.nix} (100%) diff --git a/pkgs/os-specific/darwin/spacebar/default.nix b/pkgs/by-name/sp/spacebar/package.nix similarity index 100% rename from pkgs/os-specific/darwin/spacebar/default.nix rename to pkgs/by-name/sp/spacebar/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6ac30d7930e3..f47d059d1864d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12333,9 +12333,6 @@ with pkgs; somebar = callPackage ../applications/misc/somebar { }; - spacebar = callPackage ../os-specific/darwin/spacebar { - }; - speech-denoiser = callPackage ../applications/audio/speech-denoiser { }; splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot;