libsigrok_0_3: fix
Apparently we have an old-version override and it doesn't make the bindings at all, so only run the installCheck when we know it should succeed.
This commit is contained in:
parent
b6244360cf
commit
b7d9b2a9e9
|
@ -1,10 +1,10 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check
|
||||
, libserialport, librevisa, doxygen, glibmm, python3
|
||||
, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"
|
||||
, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4", doInstallCheck ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
inherit version doInstallCheck;
|
||||
pname = "libsigrok";
|
||||
|
||||
src = fetchurl {
|
||||
|
@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
|
|||
tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
# assert that c++ bindings are included
|
||||
# note that this is only true for modern (>0.5) versions; the 0.3 series does not have these
|
||||
[[ -f $out/include/libsigrokcxx/libsigrokcxx.hpp ]] \
|
||||
|| { echo 'C++ bindings were not generated; check configure output'; false; }
|
||||
'';
|
||||
|
|
|
@ -13522,6 +13522,7 @@ in
|
|||
libsigrok_0_3 = libsigrok.override {
|
||||
version = "0.3.0";
|
||||
sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3";
|
||||
doInstallCheck = false;
|
||||
};
|
||||
|
||||
libsigrokdecode = callPackage ../development/tools/libsigrokdecode {
|
||||
|
|
Loading…
Reference in a new issue