pyrox.dev
pulseview: refactor
* Remove Qt's mkDerivation in favour of stdenv.mkDerivation to fix https://github.com/NixOS/nixpkgs/issues/180841
* Move qttools to nativeBuildInputs
+11
-11
pkgs/applications/science/electronics/pulseview/default.nix
+11
-11
pkgs/applications/science/electronics/pulseview/default.nix
···
1
-
{ mkDerivation, lib, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok
1
+
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok
2
2
, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm
3
-
, pcre, python3, qtbase, qtsvg, qttools
3
+
, pcre, python3, qtsvg, qttools, wrapQtAppsHook
4
4
}:
5
5
6
-
mkDerivation rec {
6
+
stdenv.mkDerivation rec {
7
7
pname = "pulseview";
8
8
version = "0.4.2";
9
9
10
10
src = fetchurl {
11
-
url = "https://sigrok.org/download/source/pulseview/${pname}-${version}.tar.gz";
12
-
sha256 = "1jxbpz1h3m1mgrxw74rnihj8vawgqdpf6c33cqqbyd8v7rxgfhph";
11
+
url = "https://sigrok.org/download/source/pulseview/pulseview-${version}.tar.gz";
12
+
hash = "sha256-8EL3ej4bNb8wZmMw427Dj6uNJIw2k8N7fjXUAcO/q8s=";
13
13
};
14
14
15
-
nativeBuildInputs = [ cmake pkg-config ];
15
+
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
16
16
17
17
buildInputs = [
18
18
glib boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm
19
19
pcre python3
20
-
qtbase qtsvg qttools
20
+
qtsvg
21
21
];
22
22
23
23
patches = [
···
25
25
# PR at https://github.com/sigrokproject/pulseview/pull/39
26
26
(fetchpatch {
27
27
url = "https://github.com/sigrokproject/pulseview/commit/fb89dd11f2a4a08b73c498869789e38677181a8d.patch";
28
-
sha256 = "07ifsis9jlc0jjp2d11f7hvw9kaxcbk0a57h2m4xsv1d7vzl9yfh";
28
+
hash = "sha256-0PlE/z4tbN1JFfAUBeZiXc3ENzwuhCaulIBRmXTULh4=";
29
29
})
30
30
# Fixes replaced/obsolete Qt methods
31
31
(fetchpatch {
32
-
url = "https://github.com/sigrokproject/pulseview/commit/ae726b70a7ada9a4be5808e00f0c951318479684.patch";
33
-
sha256 = "sha256-6bFXFAnTO+MBUmslw55gWWSCCPwnejqKGpHeJOoH0e8=";
34
-
})
32
+
url = "https://github.com/sigrokproject/pulseview/commit/ae726b70a7ada9a4be5808e00f0c951318479684.patch";
33
+
hash = "sha256-6bFXFAnTO+MBUmslw55gWWSCCPwnejqKGpHeJOoH0e8=";
34
+
})
35
35
];
36
36
37
37
meta = with lib; {