diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-06-21 12:40:15 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-06-29 04:40:54 +0200 |
commit | 3784fd5e46064408c73701edc1bed34c3ba37838 (patch) | |
tree | 8198a92eee53fc16ac84134988edad349dd2351d /pkgs/tools/security | |
parent | 1cd096a1f0bf541fd16d2bd24b62f20dc2348faf (diff) | |
download | nixlib-3784fd5e46064408c73701edc1bed34c3ba37838.tar nixlib-3784fd5e46064408c73701edc1bed34c3ba37838.tar.gz nixlib-3784fd5e46064408c73701edc1bed34c3ba37838.tar.bz2 nixlib-3784fd5e46064408c73701edc1bed34c3ba37838.tar.lz nixlib-3784fd5e46064408c73701edc1bed34c3ba37838.tar.xz nixlib-3784fd5e46064408c73701edc1bed34c3ba37838.tar.zst nixlib-3784fd5e46064408c73701edc1bed34c3ba37838.zip |
pcsclite: split package
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/gnupg/20.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/gnupg/22.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/open-ecard/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/opensc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/pcsclite/default.nix | 7 |
5 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index fdef447193d8..9404cb1d0655 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { prePatch = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i '' + stdenv.lib.optionalString stdenv.isLinux '' - sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c '' + stdenv.lib.optionalString stdenv.isDarwin '' find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/' '' + '' diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index f28d57fa62bd..b0381b32bcfe 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ./fix-libusb-include-path.patch ]; postPatch = stdenv.lib.optionalString stdenv.isLinux '' - sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index a0af51186edf..98f2e56e7497 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/${appName} \ --add-flags "-cp $out/share/java/cifs-${version}.jar" \ --add-flags "-jar $out/share/java/richclient-${version}.jar" \ - --suffix LD_LIBRARY_PATH ':' ${pcsclite}/lib + --suffix LD_LIBRARY_PATH ':' ${stdenv.lib.getLib pcsclite}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 819c01a0893f..7624e6cfa39e 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" - "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so" + "--with-pcsc-provider=${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so" ]; installFlags = [ diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index bf5856aec357..f46e3f22ecd1 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -5,6 +5,8 @@ stdenv.mkDerivation rec { name = "pcsclite-${version}"; version = "1.8.23"; + outputs = [ "bin" "out" "dev" "doc" "man" ]; + src = fetchurl { url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"; @@ -28,6 +30,11 @@ stdenv.mkDerivation rec { }' config.h ''; + postInstall = '' + # pcsc-spy is a debugging utility and it drags python into the closure + moveToOutput bin/pcsc-spy "$dev" + ''; + nativeBuildInputs = [ pkgconfig perl python2 ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; |