movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

kde4: Get rid of some Nepomuk cruft by default

Browse source 
(cherry picked from commit 020e88704a)
This commit is contained in:
Eelco Dolstra 2016-09-29 18:36:42 +02:00 • committed by Eelco Dolstra
parent 5ba3965c54
commit 9ea5e25cd8
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
nixos/modules/services/x11/desktop-managers/kde4.nix
View file

@ -14,7 +14,7 @@ let
# files), segfault sometimes and consume significant resources. # files), segfault sometimes and consume significant resources.
# They can be re-enabled in the KDE System Settings under "Desktop # They can be re-enabled in the KDE System Settings under "Desktop
# Search". # Search".
nepomukConfig = pkgs.writeTextFile disableNepomuk = pkgs.writeTextFile
{ name = "nepomuk-config"; { name = "nepomuk-config";
destination = "/share/config/nepomukserverrc"; destination = "/share/config/nepomukserverrc";
text = text =
@ -76,6 +76,12 @@ in
default = true; default = true;
description = "Whether to enable PIM support. Note that enabling this pulls in Akonadi and MariaDB as dependencies."; description = "Whether to enable PIM support. Note that enabling this pulls in Akonadi and MariaDB as dependencies.";
}; };
enableNepomuk = mkOption {
type = types.bool;
default = false;
description = "Whether to enable Nepomuk (deprecated).";
};
}; };
}; };
@ -144,7 +150,6 @@ in
pkgs.kde4.kde_wallpapers # contains kdm's default background pkgs.kde4.kde_wallpapers # contains kdm's default background
pkgs.kde4.oxygen_icons pkgs.kde4.oxygen_icons
pkgs.virtuoso # to enable Nepomuk to find Virtuoso
# Starts KDE's Polkit authentication agent. # Starts KDE's Polkit authentication agent.
pkgs.kde4.polkit_kde_agent pkgs.kde4.polkit_kde_agent
@ -155,18 +160,22 @@ in
xorg.xmessage # so that startkde can show error messages xorg.xmessage # so that startkde can show error messages
xorg.xset # used by startkde, non-essential xorg.xset # used by startkde, non-essential
xorg.xauth # used by kdesu xorg.xauth # used by kdesu
pkgs.shared_desktop_ontologies # used by nepomuk
pkgs.strigi # used by nepomuk
] ]
++ optionals cfg.enablePIM ++ optionals cfg.enablePIM
[ pkgs.kde4.kdepim_runtime [ pkgs.kde4.kdepim_runtime
pkgs.kde4.akonadi pkgs.kde4.akonadi
pkgs.mysql # used by akonadi pkgs.mysql # used by akonadi
] ]
++ (if cfg.enableNepomuk then
[ pkgs.shared_desktop_ontologies # used by nepomuk
pkgs.strigi # used by nepomuk
pkgs.virtuoso # to enable Nepomuk to find Virtuoso
] else
[ disableNepomuk ])
++ optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled ++ optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled
++ optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil ++ optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil
++ optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm ++ optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm
++ [ nepomukConfig ] ++ phononBackendPackages; ++ phononBackendPackages;
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];

4
pkgs/desktops/kde-4.14/kde-runtime.nix
View file

@ -1,5 +1,5 @@
{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info { kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info
, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio , libcanberra, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio
, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme, glib , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme, glib
}: }:
@ -18,8 +18,6 @@ kde {
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
passthru.propagatedUserEnvPackages = [ virtuoso ];
meta = { meta = {
license = "LGPL"; license = "LGPL";
}; };