dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #211485 from figsoda/git-nomad

Browse Source 
git-nomad: fix build
This commit is contained in:
Nick Cao 2023-01-19 13:51:28 +08:00 committed by GitHub
commit 62fbbdc0d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/version-management/git-nomad/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, SystemConfiguration }:
{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }:
rustPlatform.buildRustPackage rec {
pname = "git-nomad";
@ -11,13 +11,20 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A=";
};
buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ];
cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration
];
checkInputs = [
git
];
meta = with lib; {
description = "Synchronize work-in-progress git branches in a light weight fashion";
homepage = "https://github.com/rraval/git-nomad";
changelog = "https://github.com/rraval/git-nomad/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ rraval ];
};

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

@ -1769,9 +1769,7 @@ with pkgs;
git-machete = python3Packages.callPackage ../applications/version-management/git-machete { };
git-nomad = callPackage ../applications/version-management/git-nomad {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
git-nomad = callPackage ../applications/version-management/git-nomad { };
git-octopus = callPackage ../applications/version-management/git-octopus { };