From a2430c57d74d15ea8fa932c40279462a25cf9054 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 27 Nov 2024 00:35:26 +0100 Subject: [PATCH] discrete-scroll: rename from darwin.discrete-scroll --- .../default.nix => by-name/di/discrete-scroll/package.nix} | 4 +--- pkgs/top-level/darwin-aliases.nix | 4 ++++ pkgs/top-level/darwin-packages.nix | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/{os-specific/darwin/discrete-scroll/default.nix => by-name/di/discrete-scroll/package.nix} (92%) diff --git a/pkgs/os-specific/darwin/discrete-scroll/default.nix b/pkgs/by-name/di/discrete-scroll/package.nix similarity index 92% rename from pkgs/os-specific/darwin/discrete-scroll/default.nix rename to pkgs/by-name/di/discrete-scroll/package.nix index f38bf8d813229..abcde8ad9cb68 100644 --- a/pkgs/os-specific/darwin/discrete-scroll/default.nix +++ b/pkgs/by-name/di/discrete-scroll/package.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, Cocoa }: +{ stdenv, lib, fetchFromGitHub }: ## after launching for the first time, grant access for parent application (e.g. Terminal.app) ## from 'system preferences >> security & privacy >> accessibility' @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { sha256 = "0aqkp4kkwjlkll91xbqwf8asjww8ylsdgqvdk8d06bwdvg2cgvhg"; }; - buildInputs = [ Cocoa ]; - buildPhase = '' cc -std=c99 -O3 -Wall -framework Cocoa -o dc DiscreteScroll/main.m ''; diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index 6fafa5f487c45..768e908a361c9 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -59,6 +59,10 @@ mapAliases ({ cctools-llvm = pkgs.cctools; # added 2024-07-01 cctools-port = pkgs.cctools; # added 2024-07-17 + ### D ### + + discrete-scroll = pkgs.discrete-scroll; # added 2024-11-27 + ### I ### insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04 diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index ab8d9c387b407..9c9cb90435910 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -239,8 +239,6 @@ impure-cmds // apple-source-packages // apple-source-headers // stubs // { ios-deploy = callPackage ../os-specific/darwin/ios-deploy {}; - discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { }; - # See doc/packages/darwin-builder.section.md linux-builder = lib.makeOverridable ({ modules }: let