dsview: 0.99 -> 1.12

Adapted the patches and took a commit from upstream master branch to
allow the migration to Qt5.15.

Had to copy the patch because of the custom sourceRoot.
This commit is contained in:
freezeboy
2020-11-18 15:36:11 +01:00
parent 9635686059
commit 00b385c612
4 changed files with 36 additions and 19 deletions
@@ -1,42 +1,46 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake,
libzip, boost, fftw, qtbase,
libusb1, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl
{ lib, mkDerivation, fetchFromGitHub, pkgconfig, cmake
, libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl
, libsigrokdecode4dsl, python3, fetchpatch
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "dsview";
version = "0.99";
version = "1.12";
src = fetchFromGitHub {
owner = "DreamSourceLab";
repo = "DSView";
rev = version;
sha256 = "189i3baqgn8k3aypalayss0g489xi0an9hmvyggvxmgg1cvcwka2";
rev = "v${version}";
sha256 = "q7F4FuK/moKkouXTNPZDVon/W/ZmgtNHJka4MiTxA0U=";
};
postUnpack = ''
export sourceRoot=$sourceRoot/DSView
'';
sourceRoot = "source/DSView";
patches = [
# Fix absolute install paths
./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 = [
boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl
boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl
python3
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc";
homepage = "https://www.dreamsourcelab.com/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bachp ];
maintainers = with maintainers; [ bachp ];
};
}