diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:04:59 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:04:59 +0200 |
| commit | 1ae2f10642ea00a423354dd3176c55e47dbf3f6e (patch) | |
| tree | 7f94ddd06e808ad8fafd657badc27ec1d82d354b /pkgs/tools/security/gnupg/20.nix | |
| parent | bac995cd9f07f526d66b571331cd17b8eb7c0f62 (diff) | |
| parent | 9d0336a2bbe933c1a8e6ea7c7b39eb7ff071ef66 (diff) | |
| download | nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.tar nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.tar.gz nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.tar.bz2 nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.tar.lz nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.tar.xz nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.tar.zst nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/tools/security/gnupg/20.nix')
| -rw-r--r-- | pkgs/tools/security/gnupg/20.nix | 2 |
1 files changed, 1 insertions, 1 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/' '' + '' |