mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

Merge pull request #61687 from erictapen/opensc-cross-fix

Browse source 
opensc: fix cross compilation
This commit is contained in:
Yegor Timoshenko 2019-05-22 12:51:49 +03:00 committed by GitHub
parent de9b1003a3 9310d09dae
commit 1b7ebf191e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/libassuan/default.nix
View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, gettext, pth, libgpgerror, buildPackages }: { fetchurl, stdenv, gettext, npth, libgpgerror, buildPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libassuan"; pname = "libassuan";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
outputBin = "dev"; # libassuan-config outputBin = "dev"; # libassuan-config
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [ pth gettext ]; buildInputs = [ npth gettext ];
configureFlags = [ configureFlags = [
"--with-libgpg-error-prefix=${libgpgerror.dev}" "--with-libgpg-error-prefix=${libgpgerror.dev}"
@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
homepage = http://gnupg.org; homepage = http://gnupg.org;
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
platforms = platforms.all; platforms = platforms.all;
maintainers = [ maintainers.erictapen ];
}; };
} }

9
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
@ -58,5 +60,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/OpenSC/OpenSC/wiki; homepage = https://github.com/OpenSC/OpenSC/wiki;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = platforms.all; platforms = platforms.all;
maintainers = [ maintainers.erictapen ];
}; };
} }