diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-07-04 20:18:22 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-04 20:18:22 -0500 |
commit | c93e159e53aaa7f0feab35db6c3eb460d8197182 (patch) | |
tree | ae34fb1eb22ee595c82b339e670f279d79620fff /pkgs | |
parent | 77ffd8d5e023d1232ec226eb22dae47a7c4900c1 (diff) | |
parent | 52987ec8d36cf3d464dd8bbe1571d7a827c5855a (diff) | |
download | nixpkgs-c93e159e53aaa7f0feab35db6c3eb460d8197182.tar nixpkgs-c93e159e53aaa7f0feab35db6c3eb460d8197182.tar.gz nixpkgs-c93e159e53aaa7f0feab35db6c3eb460d8197182.tar.bz2 nixpkgs-c93e159e53aaa7f0feab35db6c3eb460d8197182.tar.lz nixpkgs-c93e159e53aaa7f0feab35db6c3eb460d8197182.tar.xz nixpkgs-c93e159e53aaa7f0feab35db6c3eb460d8197182.tar.zst nixpkgs-c93e159e53aaa7f0feab35db6c3eb460d8197182.zip |
Merge pull request #92300 from marsam/fix-libdigidoc-darwin
libdigidoc: enable on darwin
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libdigidoc/default.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 0acab602331..5936853dcbc 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f635f7a81eb..4f25dc42113 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |