From f5768b2b7691cf227c6b5fc0c150ab969a0fa663 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 5 Aug 2023 18:25:59 -0400 Subject: [PATCH] gex: use libgit2_1_6 --- pkgs/applications/version-management/gex/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix index 5cf6172a4211..40a7fc6ba79b 100644 --- a/pkgs/applications/version-management/gex/default.nix +++ b/pkgs/applications/version-management/gex/default.nix @@ -1,10 +1,8 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , pkg-config -, libgit2 -, Security +, libgit2_1_6 }: rustPlatform.buildRustPackage rec { @@ -21,9 +19,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libgit2 - ] ++ lib.optionals stdenv.isDarwin [ - Security + libgit2_1_6 ]; cargoHash = "sha256-28sMY47LAdaGmPNmxeu/w1Pn6AV3JlWbxFcit5pLkI0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c030cf89893..32e1cd2baa24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2085,9 +2085,7 @@ with pkgs; diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { }; - gex = callPackage ../applications/version-management/gex { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gex = callPackage ../applications/version-management/gex { }; gfold = callPackage ../applications/version-management/gfold { inherit (darwin.apple_sdk.frameworks) Security;