Unverified Commit 83bd5908 authored by Theodore Ni's avatar Theodore Ni
Browse files

git-branchless: use new Darwin SDK pattern

parent 4551bd2d

pkgs/applications/version-management/git-branchless/default.nix

+5 −14
Original line number Diff line number Diff line
@@ -2,15 +2,12 @@ 
  lib,

  fetchFromGitHub,

  git,

  libiconv,

  ncurses,

  openssl,

  pkg-config,

  rustPlatform,

  sqlite,

  stdenv,

  Security,

  SystemConfiguration,

}:



rustPlatform.buildRustPackage rec {
@@ -28,16 +25,10 @@ rustPlatform.buildRustPackage rec { 


  nativeBuildInputs = [ pkg-config ];



  buildInputs =

    [

  buildInputs = [

    ncurses

    openssl

    sqlite

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      Security

      SystemConfiguration

      libiconv

  ];



  postInstall = lib.optionalString (with stdenv; buildPlatform.canExecute hostPlatform) ''

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -1227,9 +1227,7 @@ with pkgs; 














  git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { };



























  git-branchless = callPackage ../applications/version-management/git-branchless {













    inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;













  };













  git-branchless = callPackage ../applications/version-management/git-branchless { };





























  git-cinnabar = callPackage ../applications/version-management/git-cinnabar {















    inherit (darwin.apple_sdk.frameworks) CoreServices;