nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-interactive-rebase-tool: switch to apple-sdk_11

Browse Source
This commit is contained in:
zowoq 2024-10-18 22:35:44 +10:00
parent 2aa42ec644
commit 580741f0fa
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-interactive-rebase-tool/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, apple-sdk_11 }:
rustPlatform.buildRustPackage rec {
pname = "git-interactive-rebase-tool";
@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv apple-sdk_11 ];
# Compilation during tests fails if this env var is not set.
preCheck = "export GIRT_BUILD_GIT_HASH=${version}";

4
pkgs/top-level/all-packages.nix
View File

@ -2245,9 +2245,7 @@ with pkgs;
git-imerge = python3Packages.callPackage ../applications/version-management/git-imerge { };
git-interactive-rebase-tool = callPackage ../applications/version-management/git-interactive-rebase-tool {
inherit (darwin.apple_sdk.frameworks) Security;
};
git-interactive-rebase-tool = callPackage ../applications/version-management/git-interactive-rebase-tool { };
git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });