diff options
author | Harrison Houghton <28076058+hrhino@users.noreply.github.com> | 2021-07-29 17:53:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-29 17:53:32 -0400 |
commit | 1642ca5a777aff0da46156d8ce5557419322248d (patch) | |
tree | c5a89389519499c414f1aff02474213dd5b3bd9b /pkgs/development | |
parent | ce67f3947e2e80b17432eb1d4ea5e7d754824084 (diff) | |
download | nixpkgs-1642ca5a777aff0da46156d8ce5557419322248d.tar nixpkgs-1642ca5a777aff0da46156d8ce5557419322248d.tar.gz nixpkgs-1642ca5a777aff0da46156d8ce5557419322248d.tar.bz2 nixpkgs-1642ca5a777aff0da46156d8ce5557419322248d.tar.lz nixpkgs-1642ca5a777aff0da46156d8ce5557419322248d.tar.xz nixpkgs-1642ca5a777aff0da46156d8ce5557419322248d.tar.zst nixpkgs-1642ca5a777aff0da46156d8ce5557419322248d.zip |
libsigrok: fix c++ bindings (#131998)
Doxygen and Python are needed as nativeBuildInputs (according to configure). Add a tiny installCheck for this.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/tools/libsigrok/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 7b9ebd57391..52272e61956 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check -, libserialport, librevisa, doxygen, glibmm +, libserialport, librevisa, doxygen, glibmm, python3 , version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4" }: @@ -17,10 +17,8 @@ stdenv.mkDerivation rec { sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libzip glib libusb1 libftdi1 check libserialport - librevisa doxygen glibmm - ]; + nativeBuildInputs = [ doxygen pkg-config python3 ]; + buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa glibmm ]; strictDeps = true; @@ -29,11 +27,18 @@ stdenv.mkDerivation rec { tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/" ''; + doInstallCheck = true; + installCheckPhase = '' + # assert that c++ bindings are included + [[ -f $out/include/libsigrokcxx/libsigrokcxx.hpp ]] \ + || { echo 'C++ bindings were not generated; check configure output'; false; } + ''; + meta = with lib; { description = "Core library of the sigrok signal analysis software suite"; homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; } |