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/applications | |
| 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/applications')
| -rw-r--r-- | pkgs/applications/misc/yubioath-desktop/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/remote/freerdp/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/office/moneyplex/default.nix | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 3d12fc037107..db48c2e7c808 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -18,7 +18,7 @@ python27Packages.buildPythonApplication rec { # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary # support that the yubicommon library uses to load libykpers - makeWrapperArgs = ''--prefix LD_LIBRARY_PATH : "${pcsclite}/lib:${yubikey-personalization}/lib" --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so"''; + makeWrapperArgs = ''--prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so"''; postInstall = '' mkdir -p $out/share/applications diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 872d9b018ff7..ad4a8849fac3 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@" '' + lib.optionalString (pcsclite != null) '' substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \ - --replace "libpcsclite.so" "${pcsclite}/lib/libpcsclite.so" + --replace "libpcsclite.so" "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so" ''; buildInputs = with lib; [ diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 4530305ee12e..31de4db76f1a 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -62,14 +62,14 @@ stdenv.mkDerivation rec { if [ ! -d "\$MDIR/pcsc" ]; then ${coreutils}/bin/mkdir -p \$MDIR/pcsc fi - if [ ! -e "\$MDIR/pcsc/libpcsclite.so.1" ] || [ ! \`${coreutils}/bin/readlink -f "\$MDIR/pcsc/libpcsclite.so.1"\` -ef "${pcsclite}/lib/libpcsclite.so.1" ]; then - ${coreutils}/bin/ln -sf "${pcsclite}/lib/libpcsclite.so.1" "\$MDIR/pcsc/libpcsclite.so.1" + if [ ! -e "\$MDIR/pcsc/libpcsclite.so.1" ] || [ ! \`${coreutils}/bin/readlink -f "\$MDIR/pcsc/libpcsclite.so.1"\` -ef "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so.1" ]; then + ${coreutils}/bin/ln -sf "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so.1" "\$MDIR/pcsc/libpcsclite.so.1" fi if [ -e "\$MDIR/rup/rupremote.lst" ]; then for i in \`${coreutils}/bin/cat "\$MDIR/rup/rupremote.lst"\`; do - ${coreutils}/bin/mv "\$MDIR/rup/"\`${coreutils}/bin/basename \$i\` "\$MDIR/\$i" + ${coreutils}/bin/mv "\$MDIR/rup/"\`${coreutils}/bin/basename \$i\` "\$MDIR/\$i" done rm -r "\$MDIR/rup/rupremote.lst" fi |