From ebebb59977715ad196b46f408f52b436c690a716 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 10:07:14 -0500 Subject: [PATCH 1/2] jankyborders: format --- pkgs/by-name/ja/jankyborders/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ja/jankyborders/package.nix b/pkgs/by-name/ja/jankyborders/package.nix index 1f1e06697aa6..306786d5ffef 100644 --- a/pkgs/by-name/ja/jankyborders/package.nix +++ b/pkgs/by-name/ja/jankyborders/package.nix @@ -1,11 +1,12 @@ -{ lib -, fetchFromGitHub -, pkg-config -, pkgs -, overrideSDK -, darwin -, testers -, nix-update-script +{ + lib, + fetchFromGitHub, + pkg-config, + pkgs, + overrideSDK, + darwin, + testers, + nix-update-script, }: let stdenv = overrideSDK pkgs.stdenv "11.0"; From b1083bd1261ed99fee8aea299300987ac2453374 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 10:08:04 -0500 Subject: [PATCH 2/2] jankyborders: switch to apple-sdk_11 --- pkgs/by-name/ja/jankyborders/package.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ja/jankyborders/package.nix b/pkgs/by-name/ja/jankyborders/package.nix index 306786d5ffef..5ccb8c8f850f 100644 --- a/pkgs/by-name/ja/jankyborders/package.nix +++ b/pkgs/by-name/ja/jankyborders/package.nix @@ -1,16 +1,12 @@ { lib, + stdenv, + apple-sdk_11, fetchFromGitHub, pkg-config, - pkgs, - overrideSDK, - darwin, testers, nix-update-script, }: -let - stdenv = overrideSDK pkgs.stdenv "11.0"; -in stdenv.mkDerivation (finalAttrs: { pname = "JankyBorders"; version = "1.6.0"; @@ -26,12 +22,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = with darwin.apple_sdk.frameworks; [ - AppKit - ApplicationServices - CoreFoundation - CoreGraphics - SkyLight + buildInputs = [ + apple-sdk_11 ]; installPhase = ''