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

libsigrokdecode: unpin python dependency

Browse Source
This commit is contained in:
Markus S. Wamser 2022-10-26 21:32:40 +02:00
parent 216a1bfb13
commit 1a24e79270
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/libsigrokdecode/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, glib, python3, check, libxcrypt }:
{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, glib, python3, check, libxcrypt }:
stdenv.mkDerivation rec {
pname = "libsigrokdecode";
@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265";
};
nativeBuildInputs = [ pkg-config ];
# upstream was rleased before Python 3.9 and thus only checks versions up to 3.8
postPatch = ''
substituteInPlace configure.ac --replace '[python-3.8-embed]' '[python3-embed]'
'';
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ glib python3 libxcrypt ];
checkInputs = [ check ];
doCheck = true;

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

@ -16619,9 +16619,7 @@ with pkgs;
python = python3;
};
libsigrokdecode = callPackage ../development/tools/libsigrokdecode {
python3 = python38;
};
libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };
# special forks used for dsview
libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { };