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-branchless: use new Darwin SDK pattern

Browse Source
This commit is contained in:
Theodore Ni 2024-11-10 23:39:46 -08:00
parent 4551bd2dba
commit 83bd590807
No known key found for this signature in database
GPG Key ID: 48B67583BDDD4474
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/version-management/git-branchless/default.nix
View File

@ -2,15 +2,12 @@
lib, lib,
fetchFromGitHub, fetchFromGitHub,
git, git,
libiconv,
ncurses, ncurses,
openssl, openssl,
pkg-config, pkg-config,
rustPlatform, rustPlatform,
sqlite, sqlite,
stdenv, stdenv,
Security,
SystemConfiguration,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -28,17 +25,11 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = buildInputs = [
[ ncurses
ncurses openssl
openssl sqlite
sqlite ];
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Security
SystemConfiguration
libiconv
];
postInstall = lib.optionalString (with stdenv; buildPlatform.canExecute hostPlatform) '' postInstall = lib.optionalString (with stdenv; buildPlatform.canExecute hostPlatform) ''
$out/bin/git-branchless install-man-pages $out/share/man $out/bin/git-branchless install-man-pages $out/share/man

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

@ -1227,9 +1227,7 @@ with pkgs;
git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { }; git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { };
git-branchless = callPackage ../applications/version-management/git-branchless { git-branchless = callPackage ../applications/version-management/git-branchless { };
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
git-cinnabar = callPackage ../applications/version-management/git-cinnabar { git-cinnabar = callPackage ../applications/version-management/git-cinnabar {
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;