diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-11-14 09:59:22 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-11-15 07:21:40 -0600 |
| commit | 8c3aa5a484b66dcf00365253e59d012976e03714 (patch) | |
| tree | 5bcb8ed8df8235cf0b77d6f062296297666fd948 | |
| parent | c9146d7e5f253c65d7c422ce2c7ee2a12261f83b (diff) | |
| download | nixlib-8c3aa5a484b66dcf00365253e59d012976e03714.tar nixlib-8c3aa5a484b66dcf00365253e59d012976e03714.tar.gz nixlib-8c3aa5a484b66dcf00365253e59d012976e03714.tar.bz2 nixlib-8c3aa5a484b66dcf00365253e59d012976e03714.tar.lz nixlib-8c3aa5a484b66dcf00365253e59d012976e03714.tar.xz nixlib-8c3aa5a484b66dcf00365253e59d012976e03714.tar.zst nixlib-8c3aa5a484b66dcf00365253e59d012976e03714.zip | |
kde5: add enableQt4Support option
| -rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 13 | ||||
| -rw-r--r-- | pkgs/desktops/kde-5/plasma/default.nix | 8 |
3 files changed, 16 insertions, 10 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index 5876aab93a7a..bf233e24797f 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -18,7 +18,10 @@ with lib; autoLogin = true; }; - desktopManager.kde5.enable = true; + desktopManager.kde5 = { + enable = true; + enableQt4Support = false; + }; # Enable touchpad support for many laptops. synaptics.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 07f6a402e81a..9b51b92faa4d 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -22,6 +22,15 @@ in description = "Enable the Plasma 5 (KDE 5) desktop environment."; }; + enableQt4Support = mkOption { + type = types.bool; + default = true; + description = '' + Enable support for Qt 4-based applications. Particularly, install the + Qt 4 version of the Breeze theme and a default backend for Phonon. + ''; + }; + }; }; @@ -105,7 +114,7 @@ in kde5.sonnet kde5.threadweaver - kde5.breeze + kde5.breeze-qt5 kde5.kactivitymanagerd kde5.kde-cli-tools kde5.kdecoration @@ -160,6 +169,8 @@ in # frameworkintegration was split with plasma-integration in Plasma 5.6 ++ lib.optional (lib.hasAttr "plasma-integration" kde5) kde5.plasma-integration + ++ lib.optionals cfg.enableQt4Support [ kde5.breeze-qt4 pkgs.phonon-backend-gstreamer ] + # Optional hardware support features ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index bb123fcdab44..36850824d63c 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -44,14 +44,6 @@ let inherit (srcs.breeze) src version; }; breeze-qt5 = callPackage ./breeze-qt5.nix {}; - breeze = - let - version = (builtins.parseDrvName breeze-qt5.name).version; - in - symlinkJoin { - name = "breeze-${version}"; - paths = map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]; - }; breeze-grub = callPackage ./breeze-grub.nix {}; breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; |