wrapQtAppsHook: Remove ad hoc Qt wrappers
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, cmake,
|
||||
libzip, boost, fftw, qtbase,
|
||||
libusb, makeWrapper, libsigrok4dsl, libsigrokdecode4dsl
|
||||
libusb, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
./install.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
|
||||
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
boost fftw qtbase libusb libzip libsigrokdecode4dsl libsigrok4dsl
|
||||
@@ -32,11 +32,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/DSView --suffix QT_PLUGIN_PATH : \
|
||||
${qtbase.bin}/${qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc";
|
||||
homepage = https://www.dreamsourcelab.com/;
|
||||
|
||||
Reference in New Issue
Block a user