diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 933f8e46fe22..8bd3dcb87040 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -86,6 +86,7 @@ let dragon = callPackage ./dragon.nix {}; elisa = callPackage ./elisa.nix {}; eventviews = callPackage ./eventviews.nix {}; + falkon = callPackage ./falkon.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; filelight = callPackage ./filelight.nix {}; granatier = callPackage ./granatier.nix {}; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/kde/falkon.nix similarity index 70% rename from pkgs/applications/networking/browsers/falkon/default.nix rename to pkgs/applications/kde/falkon.nix index 6b525fbca9f7..94cf6f5cfd25 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/kde/falkon.nix @@ -1,21 +1,13 @@ { stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch -, cmake, extra-cmake-modules, pkg-config, qmake +, cmake, extra-cmake-modules, pkg-config , libpthreadstubs, libxcb, libXdmcp , qtsvg, qttools, qtwebengine, qtx11extras , qtwayland, wrapQtAppsHook -, kwallet +, kwallet, kpurpose, karchive, kio }: mkDerivation rec { pname = "falkon"; - version = "3.2.0"; - - src = fetchFromGitHub { - owner = "KDE"; - repo = "falkon"; - rev = "v${version}"; - sha256 = "sha256-esi9YWd1PtQpDBhI1NtWEjZIoMoNUpAF+kQad67mLzE="; - }; preConfigure = '' export NONBLOCK_JS_DIALOGS=true @@ -27,21 +19,20 @@ mkDerivation rec { buildInputs = [ libpthreadstubs libxcb libXdmcp qtsvg qttools qtwebengine qtx11extras - kwallet + kwallet kpurpose karchive kio ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config - qmake qttools wrapQtAppsHook ]; meta = with lib; { description = "QtWebEngine based cross-platform web browser"; - homepage = "https://community.kde.org/Incubator/Projects/Falkon"; + homepage = "https://www.falkon.org"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6f8e864fb1f8..6276b00de2d0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1497,7 +1497,7 @@ mapAliases ({ inherit (plasma5Packages) akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk - breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa + breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa falkon ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9406627cfad4..27c92c51ca97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29051,8 +29051,6 @@ with pkgs; quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; - falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; - quodlibet = callPackage ../applications/audio/quodlibet { keybinder3 = null; libmodplug = null;