From 9310d09dae17c8e981945e6846360aa391a7be85 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Thu, 16 May 2019 22:54:49 +0200 Subject: [PATCH] opensc: fix cross compilation Apparently, the location of xsltproc needs to be manually speciefied when cross compiling. Also autoreconfHook needs to be in nativeBuildInputs. --- pkgs/tools/security/opensc/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 7de88e799c3..f14a08c8174 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