From 9a78e67344107bc9aedc8c8d04134d8624f0d8cc Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 10 Nov 2024 23:15:56 -0800 Subject: [PATCH] debase: use new Darwin SDK pattern --- pkgs/by-name/de/debase/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix index 91061e5ad2e9..1b300f1e21de 100644 --- a/pkgs/by-name/de/debase/package.nix +++ b/pkgs/by-name/de/debase/package.nix @@ -1,5 +1,5 @@ { - darwin, + apple-sdk_11, fetchFromGitHub, fetchpatch, # Delete at next version bump. lib, @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgit2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; installPhase = '' runHook preInstall diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b570aaeabf9a..f20f20f5bd36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1197,10 +1197,6 @@ with pkgs; datalad-gooey = with python3Packages; toPythonApplication datalad-gooey; - debase = callPackage ../by-name/de/debase/package.nix { - stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - }; - forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; gfold = callPackage ../applications/version-management/gfold {