uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
55
pkgs/applications/science/electronics/dsview/default.nix
Normal file
55
pkgs/applications/science/electronics/dsview/default.nix
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, pkg-config, cmake
|
||||
, libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl
|
||||
, libsigrokdecode4dsl, python3, fetchpatch
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "dsview";
|
||||
|
||||
version = "1.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DreamSourceLab";
|
||||
repo = "DSView";
|
||||
rev = "v${version}";
|
||||
sha256 = "q7F4FuK/moKkouXTNPZDVon/W/ZmgtNHJka4MiTxA0U=";
|
||||
};
|
||||
|
||||
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
|
||||
|
||||
# Change from upstream master that removes extern-C scopes which
|
||||
# cause failures with modern glib. This can likely be removed if
|
||||
# there is an upstream release >1.12
|
||||
(fetchpatch {
|
||||
name = "fix-extern-c.patch";
|
||||
url = "https://github.com/DreamSourceLab/DSView/commit/33cc733abe19872bf5ed08540a94b798d0d4ecf4.patch";
|
||||
sha256 = "sha256-TLfLQa3sdyNHTpMMvId/V6uUuOFihOZMFJOj9frnDoY=";
|
||||
stripLen = 2;
|
||||
extraPrefix = "";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl
|
||||
python3
|
||||
];
|
||||
|
||||
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 = with maintainers; [ bachp ];
|
||||
};
|
||||
}
|
||||
15
pkgs/applications/science/electronics/dsview/install.patch
Normal file
15
pkgs/applications/science/electronics/dsview/install.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index c1c33e1..208a184 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -427,8 +427,8 @@
|
||||
install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31)
|
||||
install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf)
|
||||
install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf)
|
||||
-install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
|
||||
-install(FILES DSView.desktop DESTINATION /usr/share/applications/)
|
||||
+install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/)
|
||||
+install(FILES DSView.desktop DESTINATION share/applications/)
|
||||
|
||||
#===============================================================================
|
||||
#= Packaging (handled by CPack)
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, stdenv, pkg-config, autoreconfHook,
|
||||
glib, libzip, libserialport, check, libusb1, libftdi,
|
||||
systemd, alsa-lib, dsview
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit (dsview) version src;
|
||||
|
||||
pname = "libsigrok4dsl";
|
||||
|
||||
postUnpack = ''
|
||||
export sourceRoot=$sourceRoot/libsigrok4DSL
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
||||
buildInputs = [
|
||||
glib libzip libserialport libusb1 libftdi systemd check alsa-lib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fork of the sigrok library for usage with DSView";
|
||||
homepage = "https://www.dreamsourcelab.com/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bachp ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, stdenv, pkg-config, autoreconfHook,
|
||||
glib, check, python3, dsview
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit (dsview) version src;
|
||||
|
||||
pname = "libsigrokdecode4dsl";
|
||||
|
||||
postUnpack = ''
|
||||
export sourceRoot=$sourceRoot/libsigrokdecode4DSL
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
||||
buildInputs = [
|
||||
python3 glib check
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fork of the sigrokdecode library for usage with DSView";
|
||||
homepage = "https://www.dreamsourcelab.com/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bachp ];
|
||||
};
|
||||
}
|
||||
13
pkgs/applications/science/electronics/dsview/qt515.patch
Normal file
13
pkgs/applications/science/electronics/dsview/qt515.patch
Normal 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>
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue