pulseview: refactor

* Remove Qt's mkDerivation in favour of stdenv.mkDerivation to fix https://github.com/NixOS/nixpkgs/issues/180841
* Move qttools to nativeBuildInputs
This commit is contained in:
Nikolay Korotkiy 2023-04-22 01:50:30 +04:00
parent 33dfdf8203
commit 5b9065da7e
No known key found for this signature in database
GPG key ID: D1DE6D7F693663A5

View file

@ -1,23 +1,23 @@
{ 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,13 +25,13 @@ 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=";
})
url = "https://github.com/sigrokproject/pulseview/commit/ae726b70a7ada9a4be5808e00f0c951318479684.patch";
hash = "sha256-6bFXFAnTO+MBUmslw55gWWSCCPwnejqKGpHeJOoH0e8=";
})
];
meta = with lib; {