Unverified Commit 5b9065da authored by Nikolay Korotkiy's avatar Nikolay Korotkiy
Browse files

pulseview: refactor 

* Remove Qt's mkDerivation in favour of stdenv.mkDerivation to fix https://github.com/NixOS/nixpkgs/issues/180841
* Move qttools to nativeBuildInputs
parent 33dfdf82

pkgs/applications/science/electronics/pulseview/default.nix

+11 −11
Original line number Diff line number Diff line 
{ mkDerivation, lib, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok

{ lib, stdenv, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok

, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm

, pcre, python3, qtbase, qtsvg, qttools

, pcre, python3, qtsvg, qttools, wrapQtAppsHook

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "pulseview";

  version = "0.4.2";



  src = fetchurl {

    url = "https://sigrok.org/download/source/pulseview/${pname}-${version}.tar.gz";

    sha256 = "1jxbpz1h3m1mgrxw74rnihj8vawgqdpf6c33cqqbyd8v7rxgfhph";

    url = "https://sigrok.org/download/source/pulseview/pulseview-${version}.tar.gz";

    hash = "sha256-8EL3ej4bNb8wZmMw427Dj6uNJIw2k8N7fjXUAcO/q8s=";

  };



  nativeBuildInputs = [ cmake pkg-config ];

  nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];



  buildInputs = [

    glib boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm

    pcre python3

    qtbase qtsvg qttools

    qtsvg

  ];



  patches = [
@@ -25,12 +25,12 @@ mkDerivation rec { 
    # PR at https://github.com/sigrokproject/pulseview/pull/39

    (fetchpatch {

      url = "https://github.com/sigrokproject/pulseview/commit/fb89dd11f2a4a08b73c498869789e38677181a8d.patch";

      sha256 = "07ifsis9jlc0jjp2d11f7hvw9kaxcbk0a57h2m4xsv1d7vzl9yfh";

      hash = "sha256-0PlE/z4tbN1JFfAUBeZiXc3ENzwuhCaulIBRmXTULh4=";

    })

    # Fixes replaced/obsolete Qt methods

    (fetchpatch {

      url = "https://github.com/sigrokproject/pulseview/commit/ae726b70a7ada9a4be5808e00f0c951318479684.patch";

       sha256 = "sha256-6bFXFAnTO+MBUmslw55gWWSCCPwnejqKGpHeJOoH0e8=";

      hash = "sha256-6bFXFAnTO+MBUmslw55gWWSCCPwnejqKGpHeJOoH0e8=";

    })

  ];