diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 447b5e45dfb1..2b4d11919fb4 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, opencv, qt5 }: +{ stdenv, fetchgit, cmake, opencv, qtbase, qtsvg }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16b3mmsf9r1yqqaw89fx0c3bgfg86dz4phry89wqy2hw05szgda3"; }; - buildInputs = [ opencv qt5.base qt5.svg ]; + buildInputs = [ opencv qtbase qtsvg ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d96be03f16dd..745ec5bb7096 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7704,8 +7704,6 @@ let openbabel = callPackage ../development/libraries/openbabel { }; - openbr = callPackage ../development/libraries/openbr { }; - opencascade = callPackage ../development/libraries/opencascade { tcl = tcl-8_5; tk = tk-8_5; @@ -7940,6 +7938,8 @@ let libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; + openbr = callPackage ../development/libraries/openbr { }; + phonon = callPackage ../development/libraries/phonon/qt5 { }; phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { };