summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <thomas.tuegel@runtimeverification.com>2020-09-07 10:54:55 -0500
committerThomas Tuegel <thomas.tuegel@runtimeverification.com>2020-09-07 10:54:55 -0500
commit858ccc567c3f3a5efddd875797e47909b4b821ce (patch)
treec693592cf25c8be07d1736b5cb3e9e2bc96b56ca
parente865c6ffccb80452f6353bb4bd0695c3199374cb (diff)
downloadnixpkgs-858ccc567c3f3a5efddd875797e47909b4b821ce.tar
nixpkgs-858ccc567c3f3a5efddd875797e47909b4b821ce.tar.gz
nixpkgs-858ccc567c3f3a5efddd875797e47909b4b821ce.tar.bz2
nixpkgs-858ccc567c3f3a5efddd875797e47909b4b821ce.tar.lz
nixpkgs-858ccc567c3f3a5efddd875797e47909b4b821ce.tar.xz
nixpkgs-858ccc567c3f3a5efddd875797e47909b4b821ce.tar.zst
nixpkgs-858ccc567c3f3a5efddd875797e47909b4b821ce.zip
soqt: add to libsForQt5
-rw-r--r--pkgs/development/libraries/soqt/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix
index ff7c670ca0d..7a4e6c45cf2 100644
--- a/pkgs/development/libraries/soqt/default.nix
+++ b/pkgs/development/libraries/soqt/default.nix
@@ -1,4 +1,4 @@
-{ fetchhg, stdenv, coin3d, qt5, cmake, pkgconfig }:
+{ fetchhg, stdenv, coin3d, qtbase, cmake, pkgconfig }:
 
 stdenv.mkDerivation {
   pname = "soqt";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     fetchSubrepos = true;
   };
 
-  buildInputs = [ coin3d qt5.qtbase ];
+  buildInputs = [ coin3d qtbase ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3e5e84f72f..656daadc04b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14988,6 +14988,8 @@ in
 
     qwt = callPackage ../development/libraries/qwt/6.nix { };
 
+    soqt = callPackage ../development/libraries/soqt { };
+
     telepathy = callPackage ../development/libraries/telepathy/qt { };
 
     vlc = callPackage ../applications/video/vlc {};
@@ -15299,8 +15301,6 @@ in
 
   soprano = callPackage ../development/libraries/soprano { };
 
-  soqt = callPackage ../development/libraries/soqt { };
-
   sord = callPackage ../development/libraries/sord {};
 
   soundtouch = callPackage ../development/libraries/soundtouch {};