diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 20:43:24 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-20 07:56:48 -0600 |
| commit | 4e71ebd7c98fae2552e820e18ab464a234828c6e (patch) | |
| tree | 334198179f2130b3a304e3291dce53dd95a51d36 /pkgs | |
| parent | 88514fdf581374d42083b8f8fb0303814fffbe3b (diff) | |
| download | nixlib-4e71ebd7c98fae2552e820e18ab464a234828c6e.tar nixlib-4e71ebd7c98fae2552e820e18ab464a234828c6e.tar.gz nixlib-4e71ebd7c98fae2552e820e18ab464a234828c6e.tar.bz2 nixlib-4e71ebd7c98fae2552e820e18ab464a234828c6e.tar.lz nixlib-4e71ebd7c98fae2552e820e18ab464a234828c6e.tar.xz nixlib-4e71ebd7c98fae2552e820e18ab464a234828c6e.tar.zst nixlib-4e71ebd7c98fae2552e820e18ab464a234828c6e.zip | |
dfilemanager: Qt 5 infrastructure update
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/dfilemanager/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index ba3bd5f0f0de..1891c4f21749 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, qt5, file, kde5}: +{ stdenv, fetchgit, cmake, file, qtbase, qttools, qtx11extras, solid }: let version = "git-2015-07-25"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dd21xl24xvxs100j8nzhpaqfqk8srqs92al9c03jmyjlk31s6lf"; }; - buildInputs = [ cmake qt5.base qt5.tools qt5.x11extras file kde5.solid]; + buildInputs = [ cmake qtbase qttools qtx11extras file solid ]; cmakeFlags = "-DQT5BUILD=true"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5101e94afdde..9c118b235859 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -809,7 +809,7 @@ let deis = goPackages.deis.bin // { outputs = [ "bin" ]; }; - dfilemanager = callPackage ../applications/misc/dfilemanager { }; + dfilemanager = kde5.dfilemanager; diagrams-builder = callPackage ../tools/graphics/diagrams-builder { inherit (haskellPackages) ghcWithPackages diagrams-builder; @@ -14715,6 +14715,8 @@ let libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; }; }; + dfilemanager = callPackage ../applications/misc/dfilemanager { }; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; k9copy = callPackage ../applications/video/k9copy {}; |