public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32367 from peterromfeldhk/softhsm-darwin 

softhsm: darwin support
This commit is contained in:
adisbladis 2017-12-06 12:01:35 +08:00 committed by GitHub
parent 51d5277c40 e4ce67615e
commit b9aaab9634
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/security/softhsm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, botan }: { stdenv, fetchurl, botan, libobjc, Security }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
"--localstatedir=$out/var" "--localstatedir=$out/var"
]; ];
propagatedBuildInputs =
stdenv.lib.optionals stdenv.isDarwin [ libobjc Security ];
buildInputs = [ botan ]; buildInputs = [ botan ];
postInstall = "rm -rf $out/var"; postInstall = "rm -rf $out/var";
@ -26,6 +29,6 @@ stdenv.mkDerivation rec {
description = "Cryptographic store accessible through a PKCS #11 interface"; description = "Cryptographic store accessible through a PKCS #11 interface";
license = licenses.bsd2; license = licenses.bsd2;
maintainers = [ maintainers.leenaars ]; maintainers = [ maintainers.leenaars ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

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

@ -4493,7 +4493,10 @@ with pkgs;
sshguard = callPackage ../tools/security/sshguard {}; sshguard = callPackage ../tools/security/sshguard {};
softhsm = callPackage ../tools/security/softhsm { }; softhsm = callPackage ../tools/security/softhsm {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) Security;
};
solr = callPackage ../servers/search/solr { }; solr = callPackage ../servers/search/solr { };