diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2020-02-01 22:02:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-01 22:02:47 +0100 |
| commit | 6e62b011051a71af5b3969314b7f32c367f181cd (patch) | |
| tree | 3315b3a597ffd315b4202fc39f75759bbe4f5e5c /pkgs/tools | |
| parent | 7eaf595f0008ac9016e83a58ce129d0596667bfb (diff) | |
| parent | c2d7587758435b90f080ddc20b4f9bd2f60dcad0 (diff) | |
| download | nixlib-6e62b011051a71af5b3969314b7f32c367f181cd.tar nixlib-6e62b011051a71af5b3969314b7f32c367f181cd.tar.gz nixlib-6e62b011051a71af5b3969314b7f32c367f181cd.tar.bz2 nixlib-6e62b011051a71af5b3969314b7f32c367f181cd.tar.lz nixlib-6e62b011051a71af5b3969314b7f32c367f181cd.tar.xz nixlib-6e62b011051a71af5b3969314b7f32c367f181cd.tar.zst nixlib-6e62b011051a71af5b3969314b7f32c367f181cd.zip | |
Merge pull request #78776 from mmahut/acsccid
acsccid: 1.1.6 -> 1.1.8
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/security/acsccid/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index 5a771917311f..80fa0e2dc478 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, flex, perl, pkgconfig, pcsclite, libusb }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, flex, perl, pkgconfig, pcsclite, libusb, libiconv }: stdenv.mkDerivation rec { - version = "1.1.6"; + version = "1.1.8"; pname = "acsccid"; src = fetchFromGitHub { owner = "acshk"; - repo = "acsccid"; - rev = "26bc84c738d12701e6a7289ed578671d71cbf3cb"; - sha256 = "09k7hvcay092wkyf0hjsvimg1h4qzss1nk7m5yanlib4ldhw5g5c"; + repo = pname; + rev = "v${version}"; + sha256 = "12aahrvsk21qgpjwcrr01s742ixs44nmjkvcvqyzhqb307x1rrn3"; }; doCheck = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pcsclite libusb autoconf automake libtool gettext flex perl ]; + buildInputs = [ pcsclite libusb autoconf automake libtool gettext flex perl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; postPatch = '' sed -e s_/bin/echo_echo_g -i src/Makefile.am |