pulseview: fix build

NixOS · Nov 16, 2017 · 089e0aa · 089e0aa
1 parent 903a7e2
commit 089e0aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, cmake, glib, qt5, boost, libsigrok
+{ stdenv, fetchurl, pkgconfig, cmake, glib, boost, libsigrok
 , libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm
+, pcre, librevisa, python3, qtbase, qtsvg
 }:
 
 stdenv.mkDerivation rec {
@@ -10,11 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake glib qt5.full boost libsigrok
-    libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    glib boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm
+    pcre librevisa python3 qtbase qtsvg
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)";
     homepage = http://sigrok.org/;

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -16244,7 +16244,7 @@ with pkgs;
 
   ptask = callPackage ../applications/misc/ptask { };
 
-  pulseview = callPackage ../applications/science/electronics/pulseview { };
+  pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { };
 
   puredata = callPackage ../applications/audio/puredata { };
   puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; };