lol

dfilemanager: Qt 5 infrastructure update

+5 -3
+2 -2
pkgs/applications/misc/dfilemanager/default.nix
··· 1 - { stdenv, fetchgit, cmake, qt5, file, kde5}: 1 + { stdenv, fetchgit, cmake, file, qtbase, qttools, qtx11extras, solid }: 2 2 3 3 let 4 4 version = "git-2015-07-25"; ··· 11 11 sha256 = "1dd21xl24xvxs100j8nzhpaqfqk8srqs92al9c03jmyjlk31s6lf"; 12 12 }; 13 13 14 - buildInputs = [ cmake qt5.base qt5.tools qt5.x11extras file kde5.solid]; 14 + buildInputs = [ cmake qtbase qttools qtx11extras file solid ]; 15 15 16 16 cmakeFlags = "-DQT5BUILD=true"; 17 17
+3 -1
pkgs/top-level/all-packages.nix
··· 809 809 810 810 deis = goPackages.deis.bin // { outputs = [ "bin" ]; }; 811 811 812 - dfilemanager = callPackage ../applications/misc/dfilemanager { }; 812 + dfilemanager = kde5.dfilemanager; 813 813 814 814 diagrams-builder = callPackage ../tools/graphics/diagrams-builder { 815 815 inherit (haskellPackages) ghcWithPackages diagrams-builder; ··· 14714 14714 boost = pkgs.boost.override { python=python3; }; 14715 14715 libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; }; 14716 14716 }; 14717 + 14718 + dfilemanager = callPackage ../applications/misc/dfilemanager { }; 14717 14719 14718 14720 fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; 14719 14721