ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-20 03:59:30 +03:00
Code Issues Projects Releases Wiki Activity

openbr: build with Qt 5.5

Browse Source
This commit is contained in:
Thomas Tuegel 2015-09-27 10:24:16 -05:00
parent e745467726
commit e462bdce89
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/openbr/default.nix
View File

@ -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 ];

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };