colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libsigrok: take unversioned python argument

Browse Source 
libsigrok can be built with different python versions which we want to
use for integrating it into python*Packages.
This commit is contained in:
sternenseemann 2022-01-19 13:34:13 +01:00
parent eeb2b2e3a9
commit 97052019cd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/libsigrok/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check
, libserialport, librevisa, doxygen, glibmm, python3
, libserialport, librevisa, doxygen, glibmm, python
, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4", doInstallCheck ? true
}:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw";
};
nativeBuildInputs = [ doxygen pkg-config python3 ];
nativeBuildInputs = [ doxygen pkg-config python ];
buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa glibmm ];
strictDeps = true;

5
pkgs/top-level/all-packages.nix
View File

@ -14529,9 +14529,12 @@ with pkgs;
libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { };
libsigrok = callPackage ../development/tools/libsigrok { };
libsigrok = callPackage ../development/tools/libsigrok {
python = python3;
};
# old version:
libsigrok_0_3 = libsigrok.override {
python = python3;
version = "0.3.0";
sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3";
doInstallCheck = false;