Unverified Commit 2ce277d5 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

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

libsigrokdecode: unpin python dependency
parents d3ccf64a 1a24e792

pkgs/development/tools/libsigrokdecode/default.nix

+7 −2
Original line number Diff line number Diff line 
{ 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;

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -16801,9 +16801,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 { };