diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:24:16 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:09:43 -0500 |
| commit | e462bdce89b792a4e311e514ce7947123eac3c55 (patch) | |
| tree | a7521665b967b72278f08ceeed5a93822610332b | |
| parent | e745467726103b462ea1ffe6fcfb8ab8ac18425c (diff) | |
| download | nixpkgs-e462bdce89b792a4e311e514ce7947123eac3c55.tar nixpkgs-e462bdce89b792a4e311e514ce7947123eac3c55.tar.gz nixpkgs-e462bdce89b792a4e311e514ce7947123eac3c55.tar.bz2 nixpkgs-e462bdce89b792a4e311e514ce7947123eac3c55.tar.lz nixpkgs-e462bdce89b792a4e311e514ce7947123eac3c55.tar.xz nixpkgs-e462bdce89b792a4e311e514ce7947123eac3c55.tar.zst nixpkgs-e462bdce89b792a4e311e514ce7947123eac3c55.zip | |
openbr: build with Qt 5.5
| -rw-r--r-- | pkgs/development/libraries/openbr/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 447b5e45dfb..2b4d11919fb 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 d96be03f16d..745ec5bb709 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 { }; |