forked from mirrors/nixpkgs
acsccid: fix build
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
This commit is contained in:
parent
b036be7c81
commit
1e371763f9
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.1.8";
|
version = "1.1.8";
|
||||||
|
@ -11,11 +23,28 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "12aahrvsk21qgpjwcrr01s742ixs44nmjkvcvqyzhqb307x1rrn3";
|
sha256 = "12aahrvsk21qgpjwcrr01s742ixs44nmjkvcvqyzhqb307x1rrn3";
|
||||||
};
|
};
|
||||||
|
|
||||||
doCheck = true;
|
nativeBuildInputs = [
|
||||||
|
pkgconfig
|
||||||
|
autoconf
|
||||||
|
automake
|
||||||
|
libtool
|
||||||
|
gettext
|
||||||
|
flex
|
||||||
|
perl
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
buildInputs = [
|
||||||
buildInputs = [ pcsclite libusb autoconf automake libtool gettext flex perl ]
|
pcsclite
|
||||||
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
|
libusb1
|
||||||
|
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||||
|
libiconv
|
||||||
|
];
|
||||||
|
|
||||||
|
configureFlags = [
|
||||||
|
"--enable-usbdropdir=${placeholder "out"}/pcsc/drivers"
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
sed -e s_/bin/echo_echo_g -i src/Makefile.am
|
sed -e s_/bin/echo_echo_g -i src/Makefile.am
|
||||||
|
@ -29,7 +58,6 @@ stdenv.mkDerivation rec {
|
||||||
autoheader
|
autoheader
|
||||||
automake --force-missing --add-missing
|
automake --force-missing --add-missing
|
||||||
autoconf
|
autoconf
|
||||||
configureFlags="$configureFlags --enable-usbdropdir=$out/pcsc/drivers"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
Loading…
Reference in a new issue