diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:27:05 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:09:45 -0500 |
| commit | 3935f637325f3e126aaef4c84e8a24f2b022832a (patch) | |
| tree | d8c37208ac90cb3225aab3791fffd3dc6e2238ce | |
| parent | e25434801b77eea206e47058b520b0588b08d43d (diff) | |
| download | nixlib-3935f637325f3e126aaef4c84e8a24f2b022832a.tar nixlib-3935f637325f3e126aaef4c84e8a24f2b022832a.tar.gz nixlib-3935f637325f3e126aaef4c84e8a24f2b022832a.tar.bz2 nixlib-3935f637325f3e126aaef4c84e8a24f2b022832a.tar.lz nixlib-3935f637325f3e126aaef4c84e8a24f2b022832a.tar.xz nixlib-3935f637325f3e126aaef4c84e8a24f2b022832a.tar.zst nixlib-3935f637325f3e126aaef4c84e8a24f2b022832a.zip | |
keyfinder: build with Qt 5.5
| -rw-r--r-- | pkgs/applications/audio/keyfinder/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index edbedb1c013f..ffd8d071ab21 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qt5, taglib }: +{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, taglib }: let version = "2.00"; in stdenv.mkDerivation { @@ -30,7 +30,7 @@ stdenv.mkDerivation { }; # TODO: upgrade libav when "Audio sample format conversion failed" is fixed - buildInputs = [ libav_0_8 libkeyfinder qt5.base qt5.xmlpatterns taglib ]; + buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ]; postPatch = '' substituteInPlace is_KeyFinder.pro \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32630d05b472..731ed0d03195 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11834,9 +11834,9 @@ let kermit = callPackage ../tools/misc/kermit { }; - keyfinder = callPackage ../applications/audio/keyfinder { }; + keyfinder = qt5Libs.callPackage ../applications/audio/keyfinder { }; - keyfinder-cli = callPackage ../applications/audio/keyfinder-cli { }; + keyfinder-cli = qt5Libs.callPackage ../applications/audio/keyfinder-cli { }; keymon = callPackage ../applications/video/key-mon { }; |