Merge pull request #197960 from wamserma/libsigrokdecode-unpin-python

libsigrokdecode: unpin python dependency

authored by Martin Weinelt and committed by GitHub 2ce277d5 d3ccf64a

+8 -5
+7 -2
pkgs/development/tools/libsigrokdecode/default.nix
··· 1 - { lib, stdenv, fetchurl, pkg-config, glib, python3, check, libxcrypt }: 1 + { lib, stdenv, fetchurl, pkg-config, autoreconfHook, glib, python3, check, libxcrypt }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libsigrokdecode"; ··· 9 9 sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265"; 10 10 }; 11 11 12 - nativeBuildInputs = [ pkg-config ]; 12 + # upstream was rleased before Python 3.9 and thus only checks versions up to 3.8 13 + postPatch = '' 14 + substituteInPlace configure.ac --replace '[python-3.8-embed]' '[python3-embed]' 15 + ''; 16 + 17 + nativeBuildInputs = [ pkg-config autoreconfHook ]; 13 18 buildInputs = [ glib python3 libxcrypt ]; 14 19 checkInputs = [ check ]; 15 20 doCheck = true;
+1 -3
pkgs/top-level/all-packages.nix
··· 16801 16801 python = python3; 16802 16802 }; 16803 16803 16804 - libsigrokdecode = callPackage ../development/tools/libsigrokdecode { 16805 - python3 = python38; 16806 - }; 16804 + libsigrokdecode = callPackage ../development/tools/libsigrokdecode { }; 16807 16805 16808 16806 # special forks used for dsview 16809 16807 libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { };