diff options
author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2019-05-22 12:51:49 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-22 12:51:49 +0300 |
commit | 1b7ebf191e25cb881d4a2c2c32535d13754c65ef (patch) | |
tree | 667343c385d4091d3da3dd27b71e1794d65b2428 /pkgs/tools/security | |
parent | de9b1003a36cef088d173391d869e775b0a0bcd3 (diff) | |
parent | 9310d09dae17c8e981945e6846360aa391a7be85 (diff) |
Merge pull request #61687 from erictapen/opensc-cross-fix
opensc: fix cross compilation
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/opensc/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 5170805e3f64..f14a08c8174a 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl , libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 -, Carbon, PCSC +, Carbon, PCSC, buildPackages , withApplePCSC ? stdenv.isDarwin }: @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { sha256 = "10575gb9l38cskq7swyjp0907wlziyxg4ppq33ndz319dsx69d87"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - autoreconfHook zlib readline openssl libassuan + zlib readline openssl libassuan libXt libxslt libiconv docbook_xml_dtd_412 ] ++ stdenv.lib.optional stdenv.isDarwin Carbon @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { else "${stdenv.lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" }" + (stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) + "XSLTPROC=${buildPackages.libxslt}/bin/xsltproc") ]; PCSC_CFLAGS = stdenv.lib.optionalString withApplePCSC @@ -58,5 +60,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/OpenSC/OpenSC/wiki; license = licenses.lgpl21Plus; platforms = platforms.all; + maintainers = [ maintainers.erictapen ]; }; } |