From c05c30a34e408c276dd8d74de099ba14578d120e Mon Sep 17 00:00:00 2001 From: jacobi petrucciani Date: Mon, 30 Dec 2024 21:50:53 -0500 Subject: [PATCH] git-trim: add missing zlib dependency --- .../version-management/git-trim/default.nix | 20 ++++++------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix index 1827123ebd7e..1f0171acc674 100644 --- a/pkgs/applications/version-management/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -1,14 +1,11 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libgit2, - IOKit, - CoreFoundation, - Security, + zlib, fetchpatch, }: @@ -37,16 +34,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - libgit2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - CoreFoundation - Security - ]; + buildInputs = [ + openssl + libgit2 + zlib + ]; postInstall = '' install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 844ba5a100d6..7511a4048e4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1261,9 +1261,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-trim = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-trim { - inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Security; - }; + git-trim = callPackage ../applications/version-management/git-trim { }; git-up = callPackage ../applications/version-management/git-up { pythonPackages = python3Packages;