diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:42:08 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:42:08 -0500 |
| commit | 51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2 (patch) | |
| tree | 0b9751f2bfd16a70e406b420c34a8d4097ad9492 /pkgs/applications/science/electronics/dsview | |
| parent | f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e (diff) | |
| download | nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.gz nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.bz2 nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.lz nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.xz nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.zst nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.zip | |
wrapQtAppsHook: Remove ad hoc Qt wrappers
Diffstat (limited to 'pkgs/applications/science/electronics/dsview')
| -rw-r--r-- | pkgs/applications/science/electronics/dsview/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index ecbbeff108d..55e8a7b4ffe 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -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/; |