cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #172181 from raboof/gbl-support-on-darwin

Browse source 
gbl: darwin support
This commit is contained in:
Mario Rodas 2022-05-09 09:08:04 -05:00 committed by GitHub
commit 907fd6ddf5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/archivers/gbl/default.nix
View file

@ -1,4 +1,5 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, fetchpatch
@ -6,6 +7,7 @@
, openssl
, testers
, gbl
, Security
}:
rustPlatform.buildRustPackage rec {
@ -31,7 +33,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-RUZ6wswRtV8chq3+bY9LTRf6IYMbZ9/GPl2X5UcF7d8=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
passthru.tests.version =
testers.testVersion { package = gbl; };

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

@ -2214,7 +2214,9 @@ with pkgs;
fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
gbl = callPackage ../tools/archivers/gbl { };
gbl = callPackage ../tools/archivers/gbl {
inherit (darwin.apple_sdk.frameworks) Security;
};
genann = callPackage ../development/libraries/genann { };