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

Merge pull request #92300 from marsam/fix-libdigidoc-darwin

Browse Source 
libdigidoc: enable on darwin
This commit is contained in:
Mario Rodas 2020-07-04 20:18:22 -05:00 committed by GitHub
commit c93e159e53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libdigidoc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2 }:
{ stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2, Security }:
stdenv.mkDerivation rec {
@ -12,13 +12,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl pcsclite opensc libxml2 ];
buildInputs = [ openssl pcsclite opensc libxml2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DFRAMEWORK=OFF" ];
meta = with stdenv.lib; {
description = "Library for creating DigiDoc signature files";
homepage = "http://www.id.ee/";
homepage = "https://github.com/open-eid/libdigidoc";
license = licenses.lgpl2;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.jagajaga ];
};
}

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

@ -12901,7 +12901,9 @@ in
libGL = null;
};
libdigidoc = callPackage ../development/libraries/libdigidoc { };
libdigidoc = callPackage ../development/libraries/libdigidoc {
inherit (darwin.apple_sdk.frameworks) Security;
};
libdigidocpp = callPackage ../development/libraries/libdigidocpp { };