diff options
| author | Harrison Houghton <hora.rhino@gmail.com> | 2021-08-02 16:14:32 -0400 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2021-08-02 22:36:02 +0200 |
| commit | b7d9b2a9e9d26dc98e264087e31bce151adfd7f7 (patch) | |
| tree | 23d8a8c3a8958cf11828e6a0cdee6ac8572bac77 | |
| parent | b6244360cfddc53c066fb366bae040b5875459a8 (diff) | |
| download | nixpkgs-b7d9b2a9e9d26dc98e264087e31bce151adfd7f7.tar nixpkgs-b7d9b2a9e9d26dc98e264087e31bce151adfd7f7.tar.gz nixpkgs-b7d9b2a9e9d26dc98e264087e31bce151adfd7f7.tar.bz2 nixpkgs-b7d9b2a9e9d26dc98e264087e31bce151adfd7f7.tar.lz nixpkgs-b7d9b2a9e9d26dc98e264087e31bce151adfd7f7.tar.xz nixpkgs-b7d9b2a9e9d26dc98e264087e31bce151adfd7f7.tar.zst nixpkgs-b7d9b2a9e9d26dc98e264087e31bce151adfd7f7.zip | |
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.
| -rw-r--r-- | pkgs/development/tools/libsigrok/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 52272e61956..9db3df42823 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -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; } ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f61bb8b91d1..cbd3aa6c526 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13522,6 +13522,7 @@ in libsigrok_0_3 = libsigrok.override { version = "0.3.0"; sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; + doInstallCheck = false; }; libsigrokdecode = callPackage ../development/tools/libsigrokdecode { |