public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104171 from freezeboy/unbreak-dsview-qt515

Browse Source 
dsview: 0.99 -> 1.12
This commit is contained in:
Doron Behar 2020-11-28 17:55:25 +02:00 committed by GitHub
commit 56a2c8bb22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/science/electronics/dsview/default.nix
View File

@ -1,42 +1,46 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, { lib, mkDerivation, fetchFromGitHub, pkgconfig, cmake
libzip, boost, fftw, qtbase, , libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl
libusb1, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl , libsigrokdecode4dsl, python3, fetchpatch
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "dsview"; pname = "dsview";
version = "0.99"; version = "1.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DreamSourceLab"; owner = "DreamSourceLab";
repo = "DSView"; repo = "DSView";
rev = version; rev = "v${version}";
sha256 = "189i3baqgn8k3aypalayss0g489xi0an9hmvyggvxmgg1cvcwka2"; sha256 = "q7F4FuK/moKkouXTNPZDVon/W/ZmgtNHJka4MiTxA0U=";
}; };
postUnpack = '' sourceRoot = "source/DSView";
export sourceRoot=$sourceRoot/DSView
'';
patches = [ patches = [
# Fix absolute install paths # Fix absolute install paths
./install.patch ./install.patch
# Fix buld with Qt5.15 already merged upstream for future release
# Using local file instead of content of commit #33e3d896a47 because
# sourceRoot make it unappliable
./qt515.patch
]; ];
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl
python3
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with lib; {
description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc";
homepage = "https://www.dreamsourcelab.com/"; homepage = "https://www.dreamsourcelab.com/";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.bachp ]; maintainers = with maintainers; [ bachp ];
}; };
} }

8
pkgs/applications/science/electronics/dsview/install.patch
View File

@ -2,10 +2,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1c33e1..208a184 100644 index c1c33e1..208a184 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -403,8 +403,8 @@ install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) @@ -427,8 +427,8 @@
install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png) install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31)
install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS) install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf)
install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf) install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf)
-install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) -install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
-install(FILES DSView.desktop DESTINATION /usr/share/applications/) -install(FILES DSView.desktop DESTINATION /usr/share/applications/)
+install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/) +install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/)

13
pkgs/applications/science/electronics/dsview/qt515.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 921d3db..16cdce9 100755
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -37,7 +37,7 @@
#include <QMouseEvent>
#include <QStyleOption>
-
+#include <QPainterPath>
#include <math.h>

2
pkgs/top-level/all-packages.nix
View File

@ -3430,7 +3430,7 @@ in
dropbear = callPackage ../tools/networking/dropbear { }; dropbear = callPackage ../tools/networking/dropbear { };
dsview = libsForQt514.callPackage ../applications/science/electronics/dsview { }; dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { };
dtach = callPackage ../tools/misc/dtach { }; dtach = callPackage ../tools/misc/dtach { };