Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

dsview: build for darwin

+8 -7
+7 -6
pkgs/applications/science/electronics/dsview/default.nix
··· 1 1 { stdenv, lib, fetchFromGitHub, pkg-config, cmake, wrapQtAppsHook 2 2 , libzip, boost, fftw, qtbase, qtwayland, qtsvg, libusb1 3 - , python3, fetchpatch 3 + , python3, fetchpatch, desktopToDarwinBundle 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { ··· 20 20 ./install.patch 21 21 ]; 22 22 23 - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; 23 + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ] 24 + ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; 24 25 25 26 buildInputs = [ 26 - boost fftw qtbase qtwayland qtsvg libusb1 libzip 27 + boost fftw qtbase qtsvg libusb1 libzip 27 28 python3 28 - ]; 29 + ] ++ lib.optional stdenv.isLinux qtwayland; 29 30 30 31 meta = with lib; { 31 32 description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; 32 33 homepage = "https://www.dreamsourcelab.com/"; 33 34 license = licenses.gpl3Plus; 34 - platforms = platforms.linux; 35 - maintainers = with maintainers; [ bachp ]; 35 + platforms = platforms.unix; 36 + maintainers = with maintainers; [ bachp carlossless ]; 36 37 }; 37 38 }
+1 -1
pkgs/applications/science/electronics/dsview/install.patch
··· 16 16 - install(FILES DSView/DreamSourceLab.rules DESTINATION /etc/udev/rules.d RENAME 60-dreamsourcelab.rules) 17 17 - endif() 18 18 - 19 - + install(FILES DSView/DSView.desktop DESTINATION share/applications RENAME dsview.desktop) 20 19 + install(FILES DSView/DreamSourceLab.rules DESTINATION etc/udev/rules.d RENAME 60-dreamsourcelab.rules) 21 20 endif() 21 + +install(FILES DSView/DSView.desktop DESTINATION share/applications RENAME dsview.desktop) 22 22 23 23 install(FILES NEWS25 DESTINATION share/DSView RENAME NEWS25)