dfilemanager: Qt 5 infrastructure update

This commit is contained in:
Thomas Tuegel 2015-12-19 20:43:24 -06:00
parent 88514fdf58
commit 4e71ebd7c9
2 changed files with 5 additions and 3 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, cmake, qt5, file, kde5}: { stdenv, fetchgit, cmake, file, qtbase, qttools, qtx11extras, solid }:
let let
version = "git-2015-07-25"; version = "git-2015-07-25";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1dd21xl24xvxs100j8nzhpaqfqk8srqs92al9c03jmyjlk31s6lf"; sha256 = "1dd21xl24xvxs100j8nzhpaqfqk8srqs92al9c03jmyjlk31s6lf";
}; };
buildInputs = [ cmake qt5.base qt5.tools qt5.x11extras file kde5.solid]; buildInputs = [ cmake qtbase qttools qtx11extras file solid ];
cmakeFlags = "-DQT5BUILD=true"; cmakeFlags = "-DQT5BUILD=true";

View File

@ -809,7 +809,7 @@ let
deis = goPackages.deis.bin // { outputs = [ "bin" ]; }; deis = goPackages.deis.bin // { outputs = [ "bin" ]; };
dfilemanager = callPackage ../applications/misc/dfilemanager { }; dfilemanager = kde5.dfilemanager;
diagrams-builder = callPackage ../tools/graphics/diagrams-builder { diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
inherit (haskellPackages) ghcWithPackages diagrams-builder; inherit (haskellPackages) ghcWithPackages diagrams-builder;
@ -14715,6 +14715,8 @@ let
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };
}; };
dfilemanager = callPackage ../applications/misc/dfilemanager { };
fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
k9copy = callPackage ../applications/video/k9copy {}; k9copy = callPackage ../applications/video/k9copy {};