From 3616f908df97ace225b38c37b81b560da21c24eb Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 18 May 2019 22:53:48 +0200 Subject: [PATCH 1/4] libassuan: add erictapen as maintainer --- pkgs/development/libraries/libassuan/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 507470900111..f5af5db0101c 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org; license = licenses.lgpl2Plus; platforms = platforms.all; + maintainers = [ maintainers.erictapen ]; }; } From 63fbbe0a32857e2e258ea6f8e52a40a36306a0da Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Thu, 16 May 2019 18:06:10 +0200 Subject: [PATCH 2/4] libassuan: use npth instead of pth --- pkgs/development/libraries/libassuan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index f5af5db0101c..d55c38168686 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, pth, libgpgerror, buildPackages }: +{ fetchurl, stdenv, gettext, npth, libgpgerror, buildPackages }: stdenv.mkDerivation rec { pname = "libassuan"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; # libassuan-config depsBuildBuild = [ buildPackages.stdenv.cc ]; - buildInputs = [ pth gettext ]; + buildInputs = [ npth gettext ]; configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" From f47e545578070c12d15a7c26d9515117c8a13c7e Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 18 May 2019 22:35:15 +0200 Subject: [PATCH 3/4] opensc: add erictapen as maintainer --- pkgs/tools/security/opensc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 5170805e3f64..7de88e799c33 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/OpenSC/OpenSC/wiki; license = licenses.lgpl21Plus; platforms = platforms.all; + maintainers = [ maintainers.erictapen ]; }; } From 9310d09dae17c8e981945e6846360aa391a7be85 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Thu, 16 May 2019 22:54:49 +0200 Subject: [PATCH 4/4] 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 7de88e799c33..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