JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

breeze-qt4: drop

Browse Source
This commit is contained in:
gnidorah 2017-12-22 15:32:25 +03:00
parent aa8962a6b9
commit 22596e8995
4 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -25,8 +25,8 @@ in
type = types.bool; type = types.bool;
default = true; default = true;
description = '' description = ''
Enable support for Qt 4-based applications. Particularly, install the Enable support for Qt 4-based applications. Particularly, install a
Qt 4 version of the Breeze theme and a default backend for Phonon. default backend for Phonon.
''; '';
}; };
@ -146,7 +146,7 @@ in
libsForQt5.phonon-backend-gstreamer libsForQt5.phonon-backend-gstreamer
] ]
++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ] ++ lib.optionals cfg.enableQt4Support [ pkgs.phonon-backend-gstreamer ]
# Optional hardware support features # Optional hardware support features
++ lib.optional config.hardware.bluetooth.enable bluedevil ++ lib.optional config.hardware.bluetooth.enable bluedevil

17
pkgs/desktops/plasma-5/breeze-qt4.nix
View File

@ -1,17 +0,0 @@
{
mkDerivation, lib,
automoc4, cmake, perl, pkgconfig,
kdelibs4, qt4, xproto
}:
mkDerivation {
name = "breeze-qt4";
sname = "breeze";
buildInputs = [ kdelibs4 qt4 xproto ];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
outputs = [ "out" "dev" ];
cmakeFlags = [
"-DUSE_KDE4=ON"
"-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
];
}

1
pkgs/desktops/plasma-5/default.nix
View File

@ -100,7 +100,6 @@ let
in { in {
bluedevil = callPackage ./bluedevil.nix {}; bluedevil = callPackage ./bluedevil.nix {};
breeze-gtk = callPackage ./breeze-gtk.nix {}; breeze-gtk = callPackage ./breeze-gtk.nix {};
breeze-qt4 = callPackage ./breeze-qt4.nix {};
breeze-qt5 = callPackage ./breeze-qt5.nix {}; breeze-qt5 = callPackage ./breeze-qt5.nix {};
breeze-grub = callPackage ./breeze-grub.nix {}; breeze-grub = callPackage ./breeze-grub.nix {};
breeze-plymouth = callPackage ./breeze-plymouth {}; breeze-plymouth = callPackage ./breeze-plymouth {};

2
pkgs/top-level/all-packages.nix
View File

@ -18613,7 +18613,7 @@ with pkgs;
inherit (kdeFrameworks) kded kinit frameworkintegration; inherit (kdeFrameworks) kded kinit frameworkintegration;
inherit (plasma5) inherit (plasma5)
bluedevil breeze-gtk breeze-qt4 breeze-qt5 breeze-grub breeze-plymouth bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth
kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop