b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #172610 from tjni/fix-garage-darwin

Browse source 
garage: fix build on Darwin
This commit is contained in:
Sandro 2022-05-12 01:35:16 +02:00 committed by GitHub
parent 324a5be95c e3d8a347fe
commit 997c1a8379
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/tools/filesystems/garage/default.nix
View file

@ -1,4 +1,5 @@
{ lib, rustPlatform, fetchFromGitea, protobuf, testers, garage }:
{ lib, stdenv, rustPlatform, fetchFromGitea, protobuf, testers, Security, garage }:
rustPlatform.buildRustPackage rec {
pname = "garage";
version = "0.7.0";
@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ protobuf ];
buildInputs = lib.optional stdenv.isDarwin Security;
passthru = {
tests.version = testers.testVersion { package = garage; };
};

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

@ -6079,7 +6079,9 @@ with pkgs;
gaphor = python3Packages.callPackage ../tools/misc/gaphor { };
garage = callPackage ../tools/filesystems/garage { };
garage = callPackage ../tools/filesystems/garage {
inherit (darwin.apple_sdk.frameworks) Security;
};
garmin-plugin = callPackage ../applications/misc/garmin-plugin {};