dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #284425 from carlossless/dsview-darwin

Browse Source 
dsview: darwin support
This commit is contained in:
Pascal Bach 2024-01-28 20:22:52 +01:00 committed by GitHub
commit f271ce7c25
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, wrapQtAppsHook
, libzip, boost, fftw, qtbase, qtwayland, qtsvg, libusb1
, python3, fetchpatch
, python3, fetchpatch, desktopToDarwinBundle
}:
stdenv.mkDerivation rec {
@ -20,18 +20,19 @@ stdenv.mkDerivation rec {
./install.patch
];
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]
++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
buildInputs = [
boost fftw qtbase qtwayland qtsvg libusb1 libzip
boost fftw qtbase qtsvg libusb1 libzip
python3
];
] ++ lib.optional stdenv.isLinux qtwayland;
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 ];
platforms = platforms.unix;
maintainers = with maintainers; [ bachp carlossless ];
};
}

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

@ -16,8 +16,8 @@ index eb9be42..220817c 100644
- install(FILES DSView/DreamSourceLab.rules DESTINATION /etc/udev/rules.d RENAME 60-dreamsourcelab.rules)
- endif()
-
+ install(FILES DSView/DSView.desktop DESTINATION share/applications RENAME dsview.desktop)
+ install(FILES DSView/DreamSourceLab.rules DESTINATION etc/udev/rules.d RENAME 60-dreamsourcelab.rules)
endif()
+install(FILES DSView/DSView.desktop DESTINATION share/applications RENAME dsview.desktop)
install(FILES NEWS25 DESTINATION share/DSView RENAME NEWS25)