From 2558acf87072f09181dfff7bf0ce47828e2490ec Mon Sep 17 00:00:00 2001 From: sophrosyne97 Date: Sat, 15 May 2021 18:04:01 -0400 Subject: [PATCH] pulseview: fix build error --- .../science/electronics/pulseview/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 00c830fcd337..3266b3802a4a 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkg-config, cmake, glib, boost, libsigrok +{ mkDerivation, lib, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok , libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm , pcre, librevisa, python3, qtbase, qtsvg }: @@ -20,6 +20,15 @@ mkDerivation rec { qtbase qtsvg ]; + patches = [ + # Allow building with glib 2.68 + # PR at https://github.com/sigrokproject/pulseview/pull/39 + (fetchpatch { + url = "https://github.com/sigrokproject/pulseview/commit/fb89dd11f2a4a08b73c498869789e38677181a8d.patch"; + sha256 = "153lrvbj0qf8qxx3l01v3ln8g5qjmlapwp8h1k1iir3xx3lyy37k"; + }) + ]; + meta = with lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; homepage = "https://sigrok.org/";