diff options
author | Justin Humm <justin.humm@posteo.de> | 2019-05-16 22:54:49 +0200 |
---|---|---|
committer | Justin Humm <justin.humm@posteo.de> | 2019-05-18 22:54:22 +0200 |
commit | 9310d09dae17c8e981945e6846360aa391a7be85 (patch) | |
tree | f9a21f1194c3ca839fc98ba349600faaed1c3929 /pkgs/tools/security/opensc | |
parent | f47e545578070c12d15a7c26d9515117c8a13c7e (diff) |
opensc: fix cross compilation
Apparently, the location of xsltproc needs to be manually speciefied when cross compiling. Also autoreconfHook needs to be in nativeBuildInputs.
Diffstat (limited to 'pkgs/tools/security/opensc')
-rw-r--r-- | pkgs/tools/security/opensc/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 7de88e799c332..f14a08c8174a7 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 |