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

opensc: fix cross compilation

Browse Source 
Apparently, the location of xsltproc needs to be manually speciefied
when cross compiling.

Also autoreconfHook needs to be in nativeBuildInputs.
This commit is contained in:
Justin Humm 2019-05-16 22:54:49 +02:00
parent f47e545578
commit 9310d09dae
No known key found for this signature in database
GPG Key ID: 5F24E3BD56617EB2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/security/opensc/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl
, libiconv, pcsclite, libassuan, libXt , libiconv, pcsclite, libassuan, libXt
, docbook_xsl, libxslt, docbook_xml_dtd_412 , docbook_xsl, libxslt, docbook_xml_dtd_412
, Carbon, PCSC , Carbon, PCSC, buildPackages
, withApplePCSC ? stdenv.isDarwin , withApplePCSC ? stdenv.isDarwin
}: }:
@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
sha256 = "10575gb9l38cskq7swyjp0907wlziyxg4ppq33ndz319dsx69d87"; sha256 = "10575gb9l38cskq7swyjp0907wlziyxg4ppq33ndz319dsx69d87";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ buildInputs = [
autoreconfHook zlib readline openssl libassuan zlib readline openssl libassuan
libXt libxslt libiconv docbook_xml_dtd_412 libXt libxslt libiconv docbook_xml_dtd_412
] ]
++ stdenv.lib.optional stdenv.isDarwin Carbon ++ stdenv.lib.optional stdenv.isDarwin Carbon
@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
else else
"${stdenv.lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" "${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 PCSC_CFLAGS = stdenv.lib.optionalString withApplePCSC