diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-02 07:55:45 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-02 07:55:45 +0200 |
| commit | 1e371763f969a9de1101f64b554f21bb7bc9fd42 (patch) | |
| tree | d7499c3f57858c7d89144b23b592acbe27973f42 /pkgs/tools | |
| parent | b036be7c81cb71aa6a3967b024cc05b475540492 (diff) | |
| download | nixlib-1e371763f969a9de1101f64b554f21bb7bc9fd42.tar nixlib-1e371763f969a9de1101f64b554f21bb7bc9fd42.tar.gz nixlib-1e371763f969a9de1101f64b554f21bb7bc9fd42.tar.bz2 nixlib-1e371763f969a9de1101f64b554f21bb7bc9fd42.tar.lz nixlib-1e371763f969a9de1101f64b554f21bb7bc9fd42.tar.xz nixlib-1e371763f969a9de1101f64b554f21bb7bc9fd42.tar.zst nixlib-1e371763f969a9de1101f64b554f21bb7bc9fd42.zip | |
acsccid: fix build
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/security/acsccid/default.nix | 40 |
1 files changed, 34 insertions, 6 deletions
diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index 80fa0e2dc478..5b79b3db705b 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -1,4 +1,16 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, flex, perl, pkgconfig, pcsclite, libusb, libiconv }: +{ stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, gettext +, flex +, perl +, pkgconfig +, pcsclite +, libusb1 +, libiconv +}: stdenv.mkDerivation rec { version = "1.1.8"; @@ -11,11 +23,28 @@ stdenv.mkDerivation rec { sha256 = "12aahrvsk21qgpjwcrr01s742ixs44nmjkvcvqyzhqb307x1rrn3"; }; - doCheck = true; + nativeBuildInputs = [ + pkgconfig + autoconf + automake + libtool + gettext + flex + perl + ]; + + buildInputs = [ + pcsclite + libusb1 + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pcsclite libusb autoconf automake libtool gettext flex perl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + configureFlags = [ + "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers" + ]; + + doCheck = true; postPatch = '' sed -e s_/bin/echo_echo_g -i src/Makefile.am @@ -29,7 +58,6 @@ stdenv.mkDerivation rec { autoheader automake --force-missing --add-missing autoconf - configureFlags="$configureFlags --enable-usbdropdir=$out/pcsc/drivers" ''; meta = with stdenv.lib; { |