Commit 580741f0 authored by zowoq's avatar zowoq
Browse files

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

parent 2aa42ec6

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

+2 −2
Original line number Diff line number Diff line 
{ 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}";

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -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 { });