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

Merge pull request #10731 from ttuegel/plasma-5.4

Browse Source 
KDE Plasma 5.4, Frameworks 5.15, and Applications 15.08
This commit is contained in:
Thomas Tuegel 2015-11-04 10:06:28 -06:00
commit 90cc190db2
260 changed files with 3682 additions and 17837 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/programs/environment.nix
View File

@ -38,9 +38,7 @@ in
PERL5LIB = [ "/lib/perl5/site_perl" ];
KDEDIRS = [ "" ];
STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ];
QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" "/lib/qt5/plugins" ];
QML_IMPORT_PATH = [ "/lib/qt5/imports" ];
QML2_IMPORT_PATH = [ "/lib/qt5/qml" ];
QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ];
QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ];
GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];
XDG_CONFIG_DIRS = [ "/etc/xdg" ];

135
nixos/modules/services/x11/desktop-managers/kde5.nix
View File

@ -8,38 +8,9 @@ let
cfg = xcfg.desktopManager.kde5;
xorg = pkgs.xorg;
phononBackends = {
gstreamer = [
pkgs.phonon_backend_gstreamer
pkgs.gst_all.gstreamer
pkgs.gst_all.gstPluginsBase
pkgs.gst_all.gstPluginsGood
pkgs.gst_all.gstPluginsUgly
pkgs.gst_all.gstPluginsBad
pkgs.gst_all.gstFfmpeg # for mp3 playback
pkgs.phonon_qt5_backend_gstreamer
pkgs.gst_all_1.gstreamer
pkgs.gst_all_1.gst-plugins-base
pkgs.gst_all_1.gst-plugins-good
pkgs.gst_all_1.gst-plugins-ugly
pkgs.gst_all_1.gst-plugins-bad
pkgs.gst_all_1.gst-libav # for mp3 playback
];
vlc = [
pkgs.phonon_qt5_backend_vlc
pkgs.phonon_backend_vlc
];
};
phononBackendPackages = flip concatMap cfg.phononBackends
(name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
kf5 = pkgs.kf5_stable;
plasma5 = pkgs.plasma5_stable.override { inherit kf5; };
kdeApps = pkgs.kdeApps_stable.override { inherit kf5; };
plasma5 = pkgs.plasma5_stable;
kdeApps = pkgs.kdeApps_stable;
in
@ -53,14 +24,24 @@ in
description = "Enable the Plasma 5 (KDE 5) desktop environment.";
};
phononBackends = mkOption {
type = types.listOf types.str;
default = ["gstreamer"];
example = ["gstreamer" "vlc"];
description = ''
Phonon backends to use in KDE. Only the VLC and GStreamer backends are
available. The GStreamer backend is preferred by upstream.
'';
phonon = {
gstreamer = {
enable = mkOption {
type = types.bool;
default = true;
description = "Enable the GStreamer Phonon backend (recommended).";
};
};
vlc = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable the VLC Phonon backend.";
};
};
};
};
@ -88,23 +69,77 @@ in
};
environment.systemPackages =
filter isDerivation (builtins.attrValues plasma5)
++ filter isDerivation (builtins.attrValues kf5)
++ [
[
pkgs.qt4 # qtconfig is the only way to set Qt 4 theme
kdeApps.kde-baseapps
kdeApps.kde-base-artwork
kdeApps.kmix
kf5.frameworkintegration
kf5.kinit
plasma5.breeze
plasma5.kde-cli-tools
plasma5.kdeplasma-addons
plasma5.kgamma5
plasma5.khelpcenter
plasma5.khotkeys
plasma5.kinfocenter
plasma5.kmenuedit
plasma5.kscreen
plasma5.ksysguard
plasma5.kwayland
plasma5.kwin
plasma5.kwrited
plasma5.milou
plasma5.oxygen
plasma5.polkit-kde-agent
plasma5.systemsettings
plasma5.plasma-desktop
plasma5.plasma-workspace
plasma5.plasma-workspace-wallpapers
kdeApps.ark
kdeApps.dolphin
kdeApps.dolphin-plugins
kdeApps.ffmpegthumbs
kdeApps.gwenview
kdeApps.kate
kdeApps.kdegraphics-thumbnailers
kdeApps.konsole
kdeApps.okular
kdeApps.print-manager
kdeApps.oxygen-icons
kdeApps.kde-runtime
pkgs.hicolor_icon_theme
plasma5.kde-gtk-config
pkgs.orion # GTK theme, nearly identical to Breeze
] ++ phononBackendPackages;
]
++ lib.optional config.hardware.bluetooth.enable plasma5.bluedevil
++ lib.optional config.networking.networkmanager.enable plasma5.plasma-nm
++ lib.optional config.hardware.pulseaudio.enable plasma5.plasma-pa
++ lib.optional config.powerManagement.enable plasma5.powerdevil
++ lib.optionals cfg.phonon.gstreamer.enable
[
pkgs.phonon_backend_gstreamer
pkgs.gst_all.gstreamer
pkgs.gst_all.gstPluginsBase
pkgs.gst_all.gstPluginsGood
pkgs.gst_all.gstPluginsUgly
pkgs.gst_all.gstPluginsBad
pkgs.gst_all.gstFfmpeg # for mp3 playback
pkgs.phonon_qt5_backend_gstreamer
pkgs.gst_all_1.gstreamer
pkgs.gst_all_1.gst-plugins-base
pkgs.gst_all_1.gst-plugins-good
pkgs.gst_all_1.gst-plugins-ugly
pkgs.gst_all_1.gst-plugins-bad
pkgs.gst_all_1.gst-libav # for mp3 playback
]
++ lib.optionals cfg.phonon.vlc.enable
[
pkgs.phonon_qt5_backend_vlc
pkgs.phonon_backend_vlc
];
environment.pathsToLink = [ "/share" ];
@ -114,7 +149,7 @@ in
};
environment.profileRelativeEnvVars =
mkIf (lib.elem "gstreamer" cfg.phononBackends)
mkIf cfg.phonon.gstreamer.enable
{
GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];

6
pkgs/applications/audio/cantata/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake
, withQt4 ? false, qt4
, withQt5 ? true, qtbase, qtsvg, qttools
, withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper
# I'm unable to make KDE work here, crashes at runtime so I simply
# make Qt4 the default until someone who wants KDE can figure it out.
@ -68,6 +68,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2;
nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper;
unpackPhase = "tar -xvf $src";
sourceRoot = "${name}";
@ -91,7 +93,7 @@ stdenv.mkDerivation rec {
"-DENABLE_UDISKS2=ON"
];
postInstall = ''
postInstall = stdenv.lib.optionalString withQt5 ''
wrapQtProgram "$out/bin/cantata"
'';

4
pkgs/applications/audio/dfasma/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia }:
{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, makeQtWrapper }:
let
@ -41,6 +41,8 @@ in stdenv.mkDerivation {
buildInputs = [ fftw libsndfile qtbase qtmultimedia ];
nativeBuildInputs = [ makeQtWrapper ];
postPatch = ''
substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
cp -Rv "${reaperFork.src}"/* external/REAPER

4
pkgs/applications/audio/sonic-visualiser/default.nix
View File

@ -2,7 +2,7 @@
{ stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
, libsndfile, pkgconfig, libpulseaudio, qtbase, redland
, libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland
, rubberband, serd, sord, vampSDK, fftwFloat
}:
@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
libX11
];
nativeBuildInputs = [ makeQtWrapper ];
buildPhase = ''
for i in sonic-visualiser svapp svcore svgui;
do cd $i && qmake -makefile PREFIX=$out && cd ..;

4
pkgs/applications/display-managers/sddm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchpatch, makeWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs
{ stdenv, fetchpatch, makeQtWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs
, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }:
let
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patches = [ ./sddm-ignore-config-mtime.patch ];
nativeBuildInputs = [ cmake pkgconfig qttools ];
nativeBuildInputs = [ cmake makeQtWrapper pkgconfig qttools ];
buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ];

28
pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch
View File

@ -1,28 +0,0 @@
From 1a526e40ffc1d6cb050334e8641d8b90d9858a54 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 30 Aug 2015 07:05:03 -0500
Subject: [PATCH] qalculate filename string type
---
src/backends/qalculate/qalculateexpression.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/backends/qalculate/qalculateexpression.cpp b/src/backends/qalculate/qalculateexpression.cpp
index 1891baa..b2a1984 100644
--- a/src/backends/qalculate/qalculateexpression.cpp
+++ b/src/backends/qalculate/qalculateexpression.cpp
@@ -771,9 +771,9 @@ void QalculateExpression::evaluatePlotCommand()
if (plotParameters.filetype == PLOT_FILETYPE_EPS ||
plotParameters.filetype == PLOT_FILETYPE_PS ||
(plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 &&
- plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) ||
+ plotParameters.filename.substr(p-4,4) == basic_string<char>(".eps")) ||
(plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 &&
- plotParameters.filename.substr(p-3,3) == QLatin1String(".ps")))
+ plotParameters.filename.substr(p-3,3) == basic_string<char>(".ps")))
setResult(new Cantor::EpsResult(KUrl(plotParameters.filename.c_str())));
else
setResult(new Cantor::ImageResult(KUrl(plotParameters.filename.c_str())));
--
2.5.0

540
pkgs/applications/kde-apps-15.04/default.nix
View File

@ -1,540 +0,0 @@
# Maintainer's Notes:
#
# Minor updates:
# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
# releases updates that include only the changed packages; in this case,
# multiple URLs can be provided and the results will be merged.
# 2. Run ./manifest.sh and ./dependencies.sh.
# 3. Build and enjoy.
#
# Major updates:
# We prefer not to immediately overwrite older versions with major updates, so
# make a copy of this directory first. After copying, be sure to delete ./tmp
# if it exists. Then follow the minor update instructions.
{ pkgs, newScope, kf5 ? null, plasma5 ? null, qt5 ? null, debug ? false }:
let inherit (pkgs) autonix kde4 stdenv symlinkJoin; in
with autonix; let inherit (stdenv) lib; in
let
kf5_ = if kf5 != null then kf5 else pkgs.kf510;
plasma5_ = if plasma5 != null then plasma5 else pkgs.plasma53;
qt5_ = if qt5 != null then qt5 else pkgs.qt54;
in
let
kf5 = kf5_.override { inherit debug qt5; };
plasma5 = plasma5_.override { inherit debug kf5 qt5; };
qt5 = qt5_;
kdeOrL10nPackage = name: pkg:
assert (builtins.isAttrs pkg);
if lib.hasPrefix "kde-l10n" pkg.name
then l10nPackage name pkg
else kdePackage name pkg;
kdePackage = name: pkg:
let defaultOverride = drv: drv // {
setupHook = ./setup-hook.sh;
cmakeFlags =
(drv.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
meta = {
license = with stdenv.lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
};
};
callPackage = newScope {
inherit (stdenv) mkDerivation;
inherit (pkgs) fetchurl;
inherit scope;
};
in mkPackage callPackage defaultOverride name pkg;
l10nPackage = name: pkg:
let nameVersion = builtins.parseDrvName pkg.name;
pkgQt4 = pkg // {
name = "${nameVersion.name}-qt4-${nameVersion.version}";
buildInputs = [ "kdelibs" "qt4" ];
nativeBuildInputs = [ "cmake" "gettext" "perl" ];
propagatedBuildInputs = [];
propagatedNativeBuildInputs = [];
propagatedUserEnvPkgs = [];
};
drvQt4 = overrideDerivation (kdePackage name pkgQt4) (drv: {
preConfigure = (drv.preConfigure or "") + ''
cd 4/
'';
});
pkgQt5 = pkg // {
name = "${nameVersion.name}-qt5-${nameVersion.version}";
buildInputs = [ "kdoctools" "ki18n" ];
nativeBuildInputs = [ "cmake" "extra-cmake-modules" "gettext" "perl" ];
propagatedBuildInputs = [];
propagatedNativeBuildInputs = [];
propagatedUserEnvPkgs = [];
};
drvQt5 = overrideDerivation (kdePackage name pkgQt5) (drv: {
preConfigure = (drv.preConfigure or "") + ''
cd 5/
'';
});
in symlinkJoin pkg.name [ drvQt4 drvQt5 ];
super =
let json = builtins.fromJSON (builtins.readFile ./packages.json);
mirrorUrl = n: pkg: pkg // {
src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
};
renames =
(builtins.fromJSON (builtins.readFile ./kf5-renames.json))
// (builtins.fromJSON (builtins.readFile ./plasma5-renames.json))
// (builtins.fromJSON (builtins.readFile ./renames.json));
propagated = [ "extra-cmake-modules" ];
native = [
"bison"
"extra-cmake-modules"
"flex"
"kdoctools"
"ki18n"
"libxslt"
"perl"
"pythoninterp"
];
user = [
"qt5"
"qt5core"
"qt5dbus"
"qt5gui"
"qt5qml"
"qt5quick"
"qt5svg"
"qt5webkitwidgets"
"qt5widgets"
"qt5x11extras"
"shareddesktopontologies"
"sharedmimeinfo"
];
in lib.fold (f: attrs: f attrs) json [
(lib.mapAttrs kdeOrL10nPackage)
(userEnvDeps user)
(nativeDeps native)
(propagateDeps propagated)
(renameDeps renames)
(lib.mapAttrs mirrorUrl)
];
kde4Package = pkg: overrideScope pkg (with kde4; {
inherit akonadi baloo kactivities libkdegames libkmahjongg;
kde4 = self.kdelibs;
});
scope =
# KDE Frameworks 5
kf5 //
# packages in this collection
self //
{
kf5baloo = plasma5.baloo;
kf5kdcraw = self.libkdcraw;
kf5kdegames = self.libkdegames;
kf5kipi = self.libkipi;
libkonq = self.kde-baseapps;
} //
# packages requiring same Qt 5
(with pkgs; {
accountsqt5 = accounts-qt.override { inherit qt5; };
dbusmenuqt = libdbusmenu_qt;
grantlee5 = grantlee5.override { inherit qt5; };
mlt = pkgs.mlt-qt5.override { inherit qt5; };
phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
qca-qt5 = qca-qt5.override { inherit qt5; };
qt5script = qt5.script;
qt5x11extras = qt5.x11extras;
signonqt5 = signon.override { inherit qt5; };
telepathyqt5 = telepathy_qt5.override { inherit qt5; };
}) //
# packages from nixpkgs
(with pkgs; {
inherit acl attr automoc4 avahi bison cdparanoia cfitsio cmake cups
djvulibre docbook_xml_dtd_42 docbook_xsl enchant eigen2
exiv2 fam ffmpeg flac flex freetype gmp gettext gpgme
grantlee gsl hunspell ilmbase intltool jasper lcms2
libaccounts-glib libgcrypt libotr libraw libssh libspectre
libvncserver libical networkmanager openal opencv
openexr perl phonon pkgconfig polkit_qt4 prison python qca2
qimageblitz qjson qt4 samba saneBackends soprano speechd
strigi taglib udev xorg xplanet xscreensaver xz;
alsa = alsaLib;
assuan = libassuan;
boost = boost155;
canberra = libcanberra;
eigen3 = eigen;
epub = ebook_tools;
gif = giflib;
gphoto2 = libgphoto2;
hupnp = herqq;
indi = indilib;
jpeg = libjpeg;
ldap = openldap;
libattica = attica;
musicbrainz3 = libmusicbrainz;
oggvorbis = libvorbis;
poppler = poppler_qt4;
pulseaudio = libpulseaudio;
qalculate = libqalculate;
sasl2 = cyrus_sasl;
shareddesktopontologies = shared_desktop_ontologies;
sharedmimeinfo = shared_mime_info;
sndfile = libsndfile;
tiff = libtiff;
telepathyqt4 = telepathy_qt;
tunepimp = libtunepimp;
usb = libusb;
xsltproc = libxslt;
});
self =
(builtins.removeAttrs super [
"artikulate" # build failure; wrong boost?
"kde-dev-scripts" "kde-dev-utils" # docbook errors
"kdewebdev" # unknown build failure
"kde-l10n-sr" # missing CMake command
]) // {
audiocd-kio = kde4Package super.audiocd-kio;
amor = kde4Package super.amor;
ark = extendDerivation (kde4Package super.ark) {
buildInputs = [ pkgs.makeWrapper ];
# runtime dependency
postInstall = ''
wrapProgram $out/bin/ark --prefix PATH : "${pkgs.unzipNLS}/bin"
'';
};
cantor = extendDerivation (kde4Package super.cantor) {
patches = [ ./cantor/0001-qalculate-filename-string-type.patch ];
};
cervisia = kde4Package super.cervisia;
dolphin-plugins = kde4Package super.dolphin-plugins;
dragon = kde4Package super.dragon;
ffmpegthumbs = extendDerivation (kde4Package super.ffmpegthumbs) {
nativeBuildInputs = [ scope.pkgconfig ];
};
juk = kde4Package super.juk;
jovie = kde4Package super.jovie;
kaccessible = kde4Package super.kaccessible;
kaccounts-providers = extendDerivation super.kaccounts-providers {
buildInputs = [ pkgs.libaccounts-glib ];
# hard-coded install path
preConfigure = ''
substituteInPlace webkit-options/CMakeLists.txt \
--replace "/etc/signon-ui/webkit-options.d/" \
"$out/etc/signon-ui/webkit-options.d/"
'';
};
kajongg = kde4Package super.kajongg;
kalzium = extendDerivation (kde4Package super.kalzium) {
nativeBuildInputs = [ scope.pkgconfig ];
};
kamera = kde4Package super.kamera;
kate = extendDerivation super.kate {
buildInputs = with scope; [
kconfig kguiaddons kiconthemes ki18n kinit kjobwidgets kio
kparts ktexteditor kwindowsystem kxmlgui
];
nativeBuildInputs = [ scope.kdoctools ];
};
kcachegrind = kde4Package super.kcachegrind;
kcolorchooser = kde4Package super.kcolorchooser;
kde-base-artwork = kde4Package super.kde-base-artwork;
kde-baseapps = kde4Package super.kde-baseapps;
kde-runtime = extendDerivation (kde4Package super.kde-runtime) {
buildInputs = [ scope.canberra ];
nativeBuildInputs = [ scope.pkgconfig ];
# cmake does not detect path to `ilmbase`
NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR -I${pkgs.glib}/include/glib-2.0 -I${pkgs.glib}/lib/glib-2.0/include";
# some components of this package have been replaced in other packages
meta = { priority = 10; };
};
kde-wallpapers = kde4Package super.kde-wallpapers;
kde-workspace = extendDerivation (kde4Package super.kde-workspace) {
patches = [ ./kde-workspace/ksysguard-0001-disable-signalplottertest.patch ];
buildInputs = with scope.xorg; [
libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil
];
nativeBuildInputs = [ scope.pkgconfig ];
# some components of this package have been replaced in other packages
meta = { priority = 10; };
};
kdeartwork = kde4Package super.kdeartwork;
kdegraphics-mobipocket = kde4Package super.kdegraphics-mobipocket;
kdegraphics-strigi-analyzer = kde4Package super.kdegraphics-strigi-analyzer;
kdegraphics-thumbnailers = kde4Package super.kdegraphics-thumbnailers;
kdelibs = extendDerivation super.kdelibs {
buildInputs = with scope; [ attr polkit_qt4 xsltproc xz ];
propagatedBuildInputs = with scope; [ qt4 soprano phonon strigi ];
nativeBuildInputs = [ scope.pkgconfig ];
propagatedNativeBuildInputs = with scope; [
automoc4 cmake perl sharedmimeinfo
];
patches = [ ./kdelibs/polkit-install.patch ];
# cmake does not detect path to `ilmbase`
NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR";
cmakeFlags = [
"-DDOCBOOKXML_CURRENTDTD_DIR=${scope.docbook_xml_dtd_42}/xml/dtd/docbook"
"-DDOCBOOKXSL_DIR=${scope.docbook_xsl}/xml/xsl/docbook"
"-DHUPNP_ENABLED=ON"
"-DWITH_SOLID_UDISKS2=ON"
"-DKDE_DEFAULT_HOME=.kde"
];
};
kdenetwork-filesharing = kde4Package super.kdenetwork-filesharing;
kdenetwork-strigi-analyzers = kde4Package super.kdenetwork-strigi-analyzers;
kdenlive = extendDerivation super.kdenlive { buildInputs = [ scope.mlt ]; };
kdepim = extendDerivation (kde4Package super.kdepim) {
buildInputs = with scope; [ gpgme assuan ];
nativeBuildInputs = [ scope.pkgconfig ];
};
kdepim-runtime = kde4Package super.kdepim-runtime;
kdepimlibs = extendDerivation (kde4Package super.kdepimlibs) {
nativeBuildInputs = [ scope.pkgconfig ];
};
kdesdk-kioslaves = kde4Package super.kdesdk-kioslaves;
kdesdk-strigi-analyzers = kde4Package super.kdesdk-strigi-analyzers;
kdesdk-thumbnailers =
extendDerivation (kde4Package super.kdesdk-thumbnailers) {
nativeBuildInputs = [ scope.gettext ];
};
kdf = kde4Package super.kdf;
kfloppy = kde4Package super.kfloppy;
kgamma = kde4Package super.kgamma;
kget = kde4Package super.kget;
kgoldrunner = kde4Package super.kgoldrunner;
kgpg = extendDerivation (kde4Package super.kgpg) {
buildInputs = [ scope.boost ];
};
khangman = extendDerivation super.khangman { buildInputs = [ scope.kio ]; };
kigo = kde4Package super.kigo;
kiriki = kde4Package super.kiriki;
klickety = kde4Package super.klickety;
kmag = kde4Package super.kmag;
kmahjongg = kde4Package super.kmahjongg;
kmix = extendDerivation super.kmix {
nativeBuildInputs = [ scope.pkgconfig ];
cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
};
kmousetool = extendDerivation (kde4Package super.kmousetool) {
buildInputs = with scope.xorg; [ libXtst libXt ];
};
kmouth = kde4Package super.kmouth;
knavalbattle = kde4Package super.knavalbattle;
kolf = kde4Package super.kolf;
kolourpaint = kde4Package super.kolourpaint;
konquest = kde4Package super.konquest;
kopete = kde4Package super.kopete;
kppp = kde4Package super.kppp;
kqtquickcharts = kde4Package super.kqtquickcharts;
krdc = kde4Package super.krdc;
kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) {
buildInputs = [ scope.xorg.libXtst ];
};
kreversi = kde4Package super.kreversi;
krfb = extendDerivation (kde4Package super.krfb) {
buildInputs = with scope; [ xorg.libXtst ktp-common-internals ];
};
ksaneplugin = kde4Package super.ksaneplugin;
kscd = kde4Package super.kscd;
ksirk = kde4Package super.ksirk;
ksnakeduel = kde4Package super.ksnakeduel;
ksnapshot = kde4Package super.ksnapshot;
kspaceduel = kde4Package super.kspaceduel;
kstars = extendDerivation super.kstars {
buildInputs = with scope; [ kparts cfitsio ];
};
ksudoku = kde4Package super.ksudoku;
ksystemlog = kde4Package super.ksystemlog;
ktp-accounts-kcm = extendDerivation super.ktp-accounts-kcm {
buildInputs = [ scope.libaccounts-glib ];
};
ktp-common-internals = extendDerivation super.ktp-common-internals {
buildInputs = with scope; [ kdelibs4support kparts libotr ];
};
ktp-text-ui = extendDerivation super.ktp-text-ui {
buildInputs = [ scope.kdbusaddons ];
};
ktuberling = kde4Package super.ktuberling;
ktux = kde4Package super.ktux;
kubrick = kde4Package super.kubrick;
kuser = kde4Package super.kuser;
kwalletmanager = kde4Package super.kwalletmanager;
lokalize = extendDerivation super.lokalize {
buildInputs = [ scope.kdbusaddons ];
};
libkcddb = kde4Package super.libkcddb;
libkcompactdisc = kde4Package super.libkcompactdisc;
libkdcraw = extendDerivation super.libkdcraw {
buildInputs = with scope; [ kdelibs libraw ];
nativeBuildInputs = [ scope.pkgconfig ];
};
libkdeedu = kde4Package super.libkdeedu;
libkexiv2 = extendDerivation super.libkexiv2 {
buildInputs = with scope; [ exiv2 kdelibs ];
};
libkface = extendDerivation super.libkface {
buildInputs = with scope; [ kdelibs opencv ];
};
libkgeomap = extendDerivation (kde4Package super.libkgeomap) {
cmakeFlags =
[ "-DCMAKE_MODULE_PATH=${scope.marble}/share/apps/cmake/modules" ];
};
libkipi = extendDerivation super.libkipi {
buildInputs = [ scope.kdelibs ];
};
libksane = extendDerivation super.libksane {
buildInputs = with scope; [ kdelibs saneBackends];
};
lskat = kde4Package super.lskat;
marble = kde4Package super.marble;
mplayerthumbs = kde4Package super.mplayerthumbs;
okular = extendDerivation (kde4Package super.okular) {
nativeBuildInputs = [ scope.pkgconfig ];
};
pairs = kde4Package super.pairs;
palapeli = kde4Package super.palapeli;
picmi = kde4Package super.picmi;
poxml = kde4Package super.poxml;
rocs = extendDerivation super.rocs {
buildInputs = [ scope.kdelibs4support ];
};
signon-kwallet-extension = extendDerivation super.signon-kwallet-extension {
buildInputs = [ scope.signonqt5 ];
preConfigure = ''
sed -i src/CMakeLists.txt \
-e "s,\''${SIGNONEXTENSION_PLUGINDIR},$out/lib/signon/extensions,"
'';
};
superkaramba = kde4Package super.superkaramba;
svgpart = kde4Package super.svgpart;
sweeper = kde4Package super.sweeper;
umbrello = kde4Package super.umbrello;
zeroconf-ioslave = kde4Package super.zeroconf-ioslave;
};
in self

36
pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch
View File

@ -1,36 +0,0 @@
From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 7 Sep 2015 18:55:44 -0500
Subject: [PATCH] ksysguard disable signalplottertest
---
libs/ksysguard/tests/CMakeLists.txt | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt
index d472fd7..f178b71 100644
--- a/libs/ksysguard/tests/CMakeLists.txt
+++ b/libs/ksysguard/tests/CMakeLists.txt
@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB
set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp)
kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} )
target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
-
-
-# KGraphicsSignalPlotter benchmark
-set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp)
-kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} )
-target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
-
-
-# KSignalPlotter unit test
-set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp)
-kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} )
-target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} )
-
-
-
-
--
2.5.0

12
pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch
View File

@ -1,12 +0,0 @@
diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200
+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200
@@ -139,7 +139,7 @@
${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
"Where policy files generated by KAuth will be installed" FORCE)
elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
set (KAUTH_COMPILING_FAKE_BACKEND TRUE)

70
pkgs/applications/kde-apps-15.04/kf5-renames.json
View File

@ -1,70 +0,0 @@
{
"kf5widgetsaddons": "kwidgetsaddons",
"kf5texteditor": "ktexteditor",
"kf5designerplugin": "kdesignerplugin",
"kf5bookmarks": "kbookmarks",
"kf5frameworkintegration": "frameworkintegration",
"kf5package": "kpackage",
"kf5archive": "karchive",
"kf5plasma": "plasma-framework",
"kf5kcmutils": "kcmutils",
"kf5configwidgets": "kconfigwidgets",
"ctest": "attica",
"kf5kio": "kio",
"kf5networkmanagerqt": "networkmanager-qt",
"kf5coreaddons": "kcoreaddons",
"kf5guiaddons": "kguiaddons",
"kf5jobwidgets": "kjobwidgets",
"kf5modemmanagerqt": "modemmanager-qt",
"kf5runner": "krunner",
"kf5globalaccel": "kglobalaccel",
"kf5dbusaddons": "kdbusaddons",
"kf5crash": "kcrash",
"kf5itemviews": "kitemviews",
"kf5doctools": "kdoctools",
"kf5i18n": "ki18n",
"kf5webkit": "kdewebkit",
"kf5newstuff": "knewstuff",
"kded": "kded",
"kf5notifications": "knotifications",
"kf5activitiesexperimentalstats": "kactivities",
"kf5dnssd": "kdnssd",
"kf5notifyconfig": "knotifyconfig",
"kf5iconthemes": "kiconthemes",
"kf5js": "kjs",
"kf5kde4support": "kdelibs4support",
"kf5parts": "kparts",
"backend": "plasma-framework",
"kf5completion": "kcompletion",
"kf5threadweaver": "threadweaver",
"kf5mediaplayer": "kmediaplayer",
"kf5plasmaquick": "plasma-framework",
"kf5wallet": "kwallet",
"kf5xmlgui": "kxmlgui",
"kf5attica": "attica",
"kf5declarative": "kdeclarative",
"kf5config": "kconfig",
"kf5init": "kinit",
"kf5textwidgets": "ktextwidgets",
"kf5jsembed": "kjsembed",
"kf5codecs": "kcodecs",
"kf5service": "kservice",
"kf5sonnet": "sonnet",
"kf5kdelibs4support": "kdelibs4support",
"kf5pty": "kpty",
"kf5solid": "solid",
"kf5auth": "kauth",
"ecm": "extra-cmake-modules",
"kf5activities": "kactivities",
"kf5plotting": "kplotting",
"kf5people": "kpeople",
"kf5emoticons": "kemoticons",
"kf5kross": "kross",
"kf5su": "kdesu",
"kf5khtml": "khtml",
"kf5unitconversion": "kunitconversion",
"kf5idletime": "kidletime",
"kf5windowsystem": "kwindowsystem",
"kf5xmlrpcclient": "kxmlrpcclient",
"kf5itemmodels": "kitemmodels"
}

5693
pkgs/applications/kde-apps-15.04/packages.json
View File

File diff suppressed because it is too large Load Diff

22
pkgs/applications/kde-apps-15.04/packages.sh
View File

@ -1,22 +0,0 @@
#!/bin/sh
set -x
origin="$(pwd)"
# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
alias nix-build="nix-build --no-out-link \"$origin/../../..\""
# The extra slash at the end of the URL is necessary to stop wget
# from recursing over the whole server! (No, it's not a bug.)
$(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/applications/15.04.3/" \
"$@" -A '*.tar.xz'
AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
$AUTONIX_DEPS_KF5 manifest.json
rm manifest.json

20
pkgs/applications/kde-apps-15.04/plasma5-renames.json
View File

@ -1,20 +0,0 @@
{
"kf5sysguard": "libksysguard",
"kf5baloo": "baloo",
"krunnerappdbusinterface": "plasma-workspace",
"screensaverdbusinterface": "plasma-workspace",
"ctest": "kdeplasma-addons",
"kf5filemetadata": "kfilemetadata",
"kwindbusinterface": "kwin",
"kf5activitiesexperimentalstats": "plasma-desktop",
"khotkeysdbusinterface": "khotkeys",
"libkworkspace": "plasma-workspace",
"libtaskmanager": "plasma-workspace",
"backend": "powerdevil",
"kf5screen": "libkscreen",
"ksmserverdbusinterface": "plasma-workspace",
"kf5wayland": "kwayland",
"kdecoration2": "kdecoration",
"kf5bluezqt": "bluez-qt",
"oxygenfont": "oxygen-fonts"
}

31
pkgs/applications/kde-apps-15.04/renames.json
View File

@ -1,31 +0,0 @@
{
"libkomparediff2": "libkomparediff2",
"kdegames": "libkdegames",
"ksane": "libksane",
"ctest": "sweeper",
"kastencore": "okteta",
"kastengui": "okteta",
"gpgmepp": "kdepimlibs",
"oktetacore": "okteta",
"kf5kmahjongglib": "libkmahjongg",
"oktetagui": "okteta",
"libkcompactdisc": "libkcompactdisc",
"libkdeedu": "libkdeedu",
"kaccounts": "kaccounts-integration",
"kastencontrollers": "okteta",
"backend": "kde-workspace",
"ktp": "ktp-common-internals",
"kdepimlibs": "kdepimlibs",
"qjdns": "kopete",
"libkeduvocdocument": "libkeduvocdocument",
"oktetakastencore": "okteta",
"libkcddb": "libkcddb",
"oktetakastengui": "okteta",
"kde4workspace": "kde-workspace",
"jdns": "kopete",
"okular": "okular",
"qmobipocket": "kdegraphics-mobipocket",
"kdeclarative": "kdelibs",
"analitza5": "analitza",
"oktetakastencontrollers": "okteta"
}

12
pkgs/applications/kde-apps-15.04/setup-hook.sh
View File

@ -1,12 +0,0 @@
addToSearchPath XDG_DATA_DIRS @out@/share
addQt4Plugins() {
if [[ -d "$1/lib/qt4/plugins" ]]; then
propagatedUserEnvPkgs+=" $1"
fi
if [[ -d "$1/lib/kde4/plugins" ]]; then
propagatedUserEnvPkgs+=" $1"
fi
}
envHooks+=(addQt4Plugins)

21
pkgs/applications/kde-apps-15.08/ark.nix
View File

@ -14,8 +14,17 @@
, kpty
, kwidgetsaddons
, libarchive
, p7zip
, unrar
, unzipNLS
, zip
}:
let PATH = lib.makeSearchPath "bin" [
p7zip unrar unzipNLS zip
];
in
kdeApp {
name = "ark";
nativeBuildInputs = [
@ -27,15 +36,21 @@ kdeApp {
kconfig
kcrash
kdbusaddons
ki18n
kiconthemes
khtml
kio
kservice
kpty
kwidgetsaddons
libarchive
];
propagatedBuildInputs = [
khtml
ki18n
kio
];
postInstall = ''
wrapQtProgram "$out/bin/ark" \
--prefix PATH : "${PATH}"
'';
meta = {
license = with lib.licenses; [ gpl2 lgpl3 ];
maintainers = [ lib.maintainers.ttuegel ];

8
pkgs/applications/kde-apps-15.08/baloo-widgets.nix
View File

@ -19,12 +19,14 @@ kdeApp {
];
buildInputs = [
kconfig
kio
ki18n
kservice
kfilemetadata
];
propagatedBuildInputs = [
baloo
kdelibs4support
kfilemetadata
ki18n
kio
];
meta = {
license = [ lib.licenses.lgpl21 ];

28
pkgs/applications/kde-apps-15.08/default.nix
View File

@ -21,25 +21,10 @@ let
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
mirror = "mirror://kde";
kdeApp = args:
let
inherit (args) name;
sname = args.sname or name;
inherit (srcs."${sname}") src version;
in stdenv.mkDerivation (args // {
name = "${name}-${version}";
inherit src;
cmakeFlags =
(args.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
meta = {
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
} // (args.meta or {});
});
kdeApp = import ./kde-app.nix {
inherit stdenv lib;
inherit debug srcs;
};
packages = self: with self; {
kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; };
@ -60,9 +45,12 @@ let
libkexiv2 = callPackage ./libkexiv2.nix {};
libkipi = callPackage ./libkipi.nix {};
okular = callPackage ./okular.nix {};
oxygen-icons = callPackage ./oxygen-icons.nix {};
print-manager = callPackage ./print-manager.nix {};
l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
};
newScope = scope: pkgs.kf514.newScope ({ inherit kdeApp; } // scope);
newScope = scope: pkgs.kf515.newScope ({ inherit kdeApp; } // scope);
in lib.makeScope newScope packages

6
pkgs/applications/kde-apps-15.08/dolphin-plugins.nix
View File

@ -17,10 +17,12 @@ kdeApp {
];
buildInputs = [
kxmlgui
dolphin
];
propagatedBuildInputs = [
kdelibs4support
ki18n
kio
kdelibs4support
dolphin
];
meta = {
license = [ lib.licenses.gpl2 ];

25
pkgs/applications/kde-apps-15.08/dolphin.nix
View File

@ -2,6 +2,7 @@
, lib
, extra-cmake-modules
, kdoctools
, makeQtWrapper
, kinit
, kcmutils
, kcoreaddons
@ -31,31 +32,37 @@ kdeApp {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
kinit
kcmutils
kcoreaddons
knewstuff
ki18n
kdbusaddons
kbookmarks
kconfig
kio
kparts
solid
kiconthemes
kcompletion
knotifications
phonon
baloo-widgets
];
propagatedBuildInputs = [
baloo
kactivities
kdelibs4support
kfilemetadata
ki18n
kio
ktexteditor
kwindowsystem
knotifications
kactivities
phonon
baloo
baloo-widgets
kfilemetadata
kdelibs4support
];
postInstall = ''
wrapQtProgram "$out/bin/dolphin"
'';
meta = {
license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];

5
pkgs/applications/kde-apps-15.08/fetchsrcs.sh
View File

@ -4,14 +4,13 @@
set -x
# The trailing slash at the end is necessary!
RELEASE_URL="http://download.kde.org/stable/applications/15.08.1/"
EXTRA_WGET_ARGS='-A *.tar.xz'
WGET_ARGS='http://download.kde.org/stable/applications/15.08.2/ http://download.kde.org/stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz -A *.tar.xz'
mkdir tmp; cd tmp
rm -f ../srcs.csv
wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
wget -nH -r -c --no-parent $WGET_ARGS
find . | while read src; do
if [[ -f "${src}" ]]; then

15
pkgs/applications/kde-apps-15.08/gwenview.nix
View File

@ -2,6 +2,7 @@
, lib
, extra-cmake-modules
, kdoctools
, makeQtWrapper
, baloo
, exiv2
, kactivities
@ -18,18 +19,24 @@ kdeApp {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
baloo
exiv2
kactivities
kdelibs4support
kio
lcms2
phonon
qtsvg
];
propagatedBuildInputs = [
baloo
kactivities
kdelibs4support
kio
qtx11extras
];
postInstall = ''
wrapQtProgram "$out/bin/gwenview"
'';
meta = {
license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];

18
pkgs/applications/kde-apps-15.08/kate.nix
View File

@ -34,28 +34,34 @@ kdeApp {
];
buildInputs = [
qtscript
kactivities
kconfig
kcrash
kguiaddons
kiconthemes
ki18n
kinit
kjobwidgets
kio
kparts
ktexteditor
kwindowsystem
kxmlgui
kdbusaddons
kwallet
plasma-framework
kitemmodels
knotifications
threadweaver
knewstuff
libgit2
];
propagatedBuildInputs = [
kactivities
ki18n
kio
ktexteditor
kwindowsystem
plasma-framework
];
postInstall = ''
wrapQtProgram "$out/bin/kate"
wrapQtProgram "$out/bin/kwrite"
'';
meta = {
license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
maintainers = [ lib.maintainers.ttuegel ];

23
pkgs/applications/kde-apps-15.08/kde-app.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, lib, debug, srcs }:
args:
let
inherit (args) name;
sname = args.sname or name;
inherit (srcs."${sname}") src version;
in
stdenv.mkDerivation (args // {
name = "${name}-${version}";
inherit src;
cmakeFlags =
(args.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
meta = {
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
} // (args.meta or {});
})

20
pkgs/applications/kde-apps-15.08/kde-locale-4.nix Normal file
View File

@ -0,0 +1,20 @@
name: args:
{ kdeApp, automoc4, cmake, gettext, kdelibs, perl }:
kdeApp (args // {
sname = "kde-l10n-${name}";
name = "kde-l10n-${name}-qt4";
nativeBuildInputs =
[ automoc4 cmake gettext perl ]
++ (args.nativeBuildInputs or []);
buildInputs =
[ kdelibs ]
++ (args.buildInputs or []);
preConfigure = ''
sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt
${args.preConfigure or ""}
'';
})

17
pkgs/applications/kde-apps-15.08/kde-locale-5.nix Normal file
View File

@ -0,0 +1,17 @@
name: args:
{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }:
kdeApp (args // {
sname = "kde-l10n-${name}";
name = "kde-l10n-${name}-qt5";
nativeBuildInputs =
[ cmake extra-cmake-modules gettext kdoctools ]
++ (args.nativeBuildInputs or []);
preConfigure = ''
sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt
${args.preConfigure or ""}
'';
})

7
pkgs/applications/kde-apps-15.08/kgpg.nix
View File

@ -2,12 +2,14 @@
, lib
, automoc4
, cmake
, makeWrapper
, perl
, pkgconfig
, boost
, gpgme
, kdelibs
, kdepimlibs
, gnupg
}:
kdeApp {
@ -15,6 +17,7 @@ kdeApp {
nativeBuildInputs = [
automoc4
cmake
makeWrapper
perl
pkgconfig
];
@ -24,6 +27,10 @@ kdeApp {
kdelibs
kdepimlibs
];
postInstall = ''
wrapProgram "$out/bin/kgpg" \
--prefix PATH : "${gnupg}/bin"
'';
meta = {
license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ];

13
pkgs/applications/kde-apps-15.08/konsole.nix
View File

@ -2,6 +2,7 @@
, lib
, extra-cmake-modules
, kdoctools
, makeQtWrapper
, qtscript
, kbookmarks
, kcompletion
@ -30,6 +31,7 @@ kdeApp {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
qtscript
@ -39,10 +41,8 @@ kdeApp {
kconfigwidgets
kcoreaddons
kguiaddons
ki18n
kiconthemes
kinit
kdelibs4support
kio
knotifications
knotifyconfig
@ -51,9 +51,16 @@ kdeApp {
kservice
ktextwidgets
kwidgetsaddons
kwindowsystem
kxmlgui
];
propagatedBuildInputs = [
kdelibs4support
ki18n
kwindowsystem
];
postInstall = ''
wrapQtProgram "$out/bin/konsole"
'';
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];

231
pkgs/applications/kde-apps-15.08/l10n.nix Normal file
View File

@ -0,0 +1,231 @@
{ callPackage, pkgs, lib }:
let
kdeLocale4 = import ./kde-locale-4.nix;
kdeLocale5 = import ./kde-locale-5.nix;
in
lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
ar = {
qt4 = callPackage (kdeLocale4 "ar" {}) {};
qt5 = callPackage (kdeLocale5 "ar" {}) {};
};
bg = {
qt4 = callPackage (kdeLocale4 "bg" {}) {};
qt5 = callPackage (kdeLocale5 "bg" {}) {};
};
bs = {
qt4 = callPackage (kdeLocale4 "bs" {}) {};
qt5 = callPackage (kdeLocale5 "bs" {}) {};
};
ca = {
qt4 = callPackage (kdeLocale4 "ca" {}) {};
qt5 = callPackage (kdeLocale5 "ca" {}) {};
};
ca_valencia = {
qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {};
};
cs = {
qt4 = callPackage (kdeLocale4 "cs" {}) {};
qt5 = callPackage (kdeLocale5 "cs" {}) {};
};
da = {
qt4 = callPackage (kdeLocale4 "da" {}) {};
qt5 = callPackage (kdeLocale5 "da" {}) {};
};
de = {
qt4 = callPackage (kdeLocale4 "de" {}) {};
qt5 = callPackage (kdeLocale5 "de" {}) {};
};
el = {
qt4 = callPackage (kdeLocale4 "el" {}) {};
qt5 = callPackage (kdeLocale5 "el" {}) {};
};
en_GB = {
qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
qt5 = callPackage (kdeLocale5 "en_GB" {}) {};
};
eo = {
qt4 = callPackage (kdeLocale4 "eo" {}) {};
qt5 = callPackage (kdeLocale5 "eo" {}) {};
};
es = {
qt4 = callPackage (kdeLocale4 "es" {}) {};
qt5 = callPackage (kdeLocale5 "es" {}) {};
};
et = {
qt4 = callPackage (kdeLocale4 "et" {}) {};
qt5 = callPackage (kdeLocale5 "et" {}) {};
};
eu = {
qt4 = callPackage (kdeLocale4 "eu" {}) {};
qt5 = callPackage (kdeLocale5 "eu" {}) {};
};
fa = {
qt4 = callPackage (kdeLocale4 "fa" {}) {};
qt5 = callPackage (kdeLocale5 "fa" {}) {};
};
fi = {
qt4 = callPackage (kdeLocale4 "fi" {}) {};
qt5 = callPackage (kdeLocale5 "fi" {}) {};
};
fr = {
qt4 = callPackage (kdeLocale4 "fr" {}) {};
qt5 = callPackage (kdeLocale5 "fr" {}) {};
};
ga = {
qt4 = callPackage (kdeLocale4 "ga" {}) {};
qt5 = callPackage (kdeLocale5 "ga" {}) {};
};
gl = {
qt4 = callPackage (kdeLocale4 "gl" {}) {};
qt5 = callPackage (kdeLocale5 "gl" {}) {};
};
he = {
qt4 = callPackage (kdeLocale4 "he" {}) {};
qt5 = callPackage (kdeLocale5 "he" {}) {};
};
hi = {
qt4 = callPackage (kdeLocale4 "hi" {}) {};
qt5 = callPackage (kdeLocale5 "hi" {}) {};
};
hr = {
qt4 = callPackage (kdeLocale4 "hr" {}) {};
qt5 = callPackage (kdeLocale5 "hr" {}) {};
};
hu = {
qt4 = callPackage (kdeLocale4 "hu" {}) {};
qt5 = callPackage (kdeLocale5 "hu" {}) {};
};
ia = {
qt4 = callPackage (kdeLocale4 "ia" {}) {};
qt5 = callPackage (kdeLocale5 "ia" {}) {};
};
id = {
qt4 = callPackage (kdeLocale4 "id" {}) {};
qt5 = callPackage (kdeLocale5 "id" {}) {};
};
is = {
qt4 = callPackage (kdeLocale4 "is" {}) {};
qt5 = callPackage (kdeLocale5 "is" {}) {};
};
it = {
qt4 = callPackage (kdeLocale4 "it" {}) {};
qt5 = callPackage (kdeLocale5 "it" {}) {};
};
ja = {
qt4 = callPackage (kdeLocale4 "ja" {}) {};
qt5 = callPackage (kdeLocale5 "ja" {}) {};
};
kk = {
qt4 = callPackage (kdeLocale4 "kk" {}) {};
qt5 = callPackage (kdeLocale5 "kk" {}) {};
};
km = {
qt4 = callPackage (kdeLocale4 "km" {}) {};
qt5 = callPackage (kdeLocale5 "km" {}) {};
};
ko = {
qt4 = callPackage (kdeLocale4 "ko" {}) {};
qt5 = callPackage (kdeLocale5 "ko" {}) {};
};
lt = {
qt4 = callPackage (kdeLocale4 "lt" {}) {};
qt5 = callPackage (kdeLocale5 "lt" {}) {};
};
lv = {
qt4 = callPackage (kdeLocale4 "lv" {}) {};
qt5 = callPackage (kdeLocale5 "lv" {}) {};
};
mr = {
qt4 = callPackage (kdeLocale4 "mr" {}) {};
qt5 = callPackage (kdeLocale5 "mr" {}) {};
};
nb = {
qt4 = callPackage (kdeLocale4 "nb" {}) {};
qt5 = callPackage (kdeLocale5 "nb" {}) {};
};
nds = {
qt4 = callPackage (kdeLocale4 "nds" {}) {};
qt5 = callPackage (kdeLocale5 "nds" {}) {};
};
nl = {
qt4 = callPackage (kdeLocale4 "nl" {}) {};
qt5 = callPackage (kdeLocale5 "nl" {}) {};
};
nn = {
qt4 = callPackage (kdeLocale4 "nn" {}) {};
qt5 = callPackage (kdeLocale5 "nn" {}) {};
};
pa = {
qt4 = callPackage (kdeLocale4 "pa" {}) {};
qt5 = callPackage (kdeLocale5 "pa" {}) {};
};
pl = {
qt4 = callPackage (kdeLocale4 "pl" {}) {};
qt5 = callPackage (kdeLocale5 "pl" {}) {};
};
pt = {
qt4 = callPackage (kdeLocale4 "pt" {}) {};
qt5 = callPackage (kdeLocale5 "pt" {}) {};
};
pt_BR = {
qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
qt5 = callPackage (kdeLocale5 "pt_BR" {}) {};
};
ro = {
qt4 = callPackage (kdeLocale4 "ro" {}) {};
qt5 = callPackage (kdeLocale5 "ro" {}) {};
};
ru = {
qt4 = callPackage (kdeLocale4 "ru" {}) {};
qt5 = callPackage (kdeLocale5 "ru" {}) {};
};
sk = {
qt4 = callPackage (kdeLocale4 "sk" {}) {};
qt5 = callPackage (kdeLocale5 "sk" {}) {};
};
sl = {
qt4 = callPackage (kdeLocale4 "sl" {}) {};
qt5 = callPackage (kdeLocale5 "sl" {}) {};
};
sr = {
qt4 = callPackage (kdeLocale4 "sr" {}) {};
qt5 = callPackage (kdeLocale5 "sr" {
preConfigure = ''
sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
'';
}) {};
};
sv = {
qt4 = callPackage (kdeLocale4 "sv" {}) {};
qt5 = callPackage (kdeLocale5 "sv" {}) {};
};
tr = {
qt4 = callPackage (kdeLocale4 "tr" {}) {};
qt5 = callPackage (kdeLocale5 "tr" {}) {};
};
ug = {
qt4 = callPackage (kdeLocale4 "ug" {}) {};
qt5 = callPackage (kdeLocale5 "ug" {}) {};
};
uk = {
qt4 = callPackage (kdeLocale4 "uk" {}) {};
qt5 = callPackage (kdeLocale5 "uk" {}) {};
};
wa = {
qt4 = callPackage (kdeLocale4 "wa" {}) {};
qt5 = callPackage (kdeLocale5 "wa" {}) {};
};
zh_CN = {
qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
qt5 = callPackage (kdeLocale5 "zh_CN" {}) {};
};
zh_TW = {
qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
qt5 = callPackage (kdeLocale5 "zh_TW" {}) {};
};
}

13
pkgs/applications/kde-apps-15.08/oxygen-icons.nix Normal file
View File

@ -0,0 +1,13 @@
{ kdeApp
, lib
, cmake
}:
kdeApp {
name = "oxygen-icons";
nativeBuildInputs = [ cmake ];
meta = {
license = lib.licenses.lgpl3Plus;
maintainers = [ lib.maintainers.ttuegel ];
};
}

12
pkgs/applications/kde-apps-15.08/print-manager.nix
View File

@ -23,21 +23,23 @@ kdeApp {
extra-cmake-modules
];
buildInputs = [
qtdeclarative
cups
kconfig
kconfigwidgets
kdbusaddons
kiconthemes
ki18n
kcmutils
kio
knotifications
plasma-framework
kwidgetsaddons
kwindowsystem
kitemviews
];
propagatedBuildInputs = [
ki18n
kio
kwindowsystem
plasma-framework
qtdeclarative
];
meta = {
license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ];

1984
pkgs/applications/kde-apps-15.08/srcs.nix
View File

File diff suppressed because it is too large Load Diff

5
pkgs/applications/misc/cool-retro-term/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, makeWrapper, qtbase, qtquick1, qmltermwidget }:
{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget }:
stdenv.mkDerivation rec {
version = "1.0.0";
@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
sed -i -e '/qmltermwidget/d' cool-retro-term.pro
'';
buildInputs = [ makeWrapper qtbase qtquick1 qmltermwidget ];
buildInputs = [ qtbase qtquick1 qmltermwidget ];
nativeBuildInputs = [ makeQtWrapper ];
configurePhase = "qmake PREFIX=$out";

258
pkgs/desktops/plasma-5.3/default.nix
View File

@ -1,258 +0,0 @@
# Maintainer's Notes:
#
# Minor updates:
# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
# releases updates that include only the changed packages; in this case,
# multiple URLs can be provided and the results will be merged.
# 2. Run ./manifest.sh and ./dependencies.sh.
# 3. Build and enjoy.
#
# Major updates:
# We prefer not to immediately overwrite older versions with major updates, so
# make a copy of this directory first. After copying, be sure to delete ./tmp
# if it exists. Then follow the minor update instructions.
{ pkgs, newScope, kdeApps ? null, kf5 ? null, qt5 ? null, debug ? false }:
let inherit (pkgs) autonix stdenv symlinkJoin; in
with autonix; let inherit (stdenv) lib; in
let
kdeApps_ = if kdeApps != null then kdeApps else pkgs.kdeApps_15_04;
kf5_ = if kf5 != null then kf5 else pkgs.kf510;
qt5_ = if qt5 != null then qt5 else pkgs.qt54;
in
let
kdeApps = kdeApps_.override { inherit debug kf5 qt5; plasma5 = self; };
kf5 = kf5_.override { inherit debug qt5; };
qt5 = qt5_;
kdePackage = name: pkg:
let defaultOverride = drv: drv // {
setupHook = ./setup-hook.sh;
cmakeFlags =
(drv.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
meta = {
license = with stdenv.lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
};
};
callPackage = newScope {
inherit (stdenv) mkDerivation;
inherit (pkgs) fetchurl;
inherit scope;
};
in mkPackage callPackage defaultOverride name pkg;
super =
let json = builtins.fromJSON (builtins.readFile ./packages.json);
mirrorUrl = n: pkg: pkg // {
src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
};
renames =
(builtins.fromJSON (builtins.readFile ./kf5-renames.json))
// (builtins.fromJSON (builtins.readFile ./renames.json));
propagated = [ "extra-cmake-modules" ];
native = [
"bison"
"extra-cmake-modules"
"flex"
"kdoctools"
"ki18n"
"libxslt"
"perl"
"pythoninterp"
];
user = [
"qt5"
"qt5core"
"qt5dbus"
"qt5gui"
"qt5qml"
"qt5quick"
"qt5svg"
"qt5webkitwidgets"
"qt5widgets"
"qt5x11extras"
"shareddesktopontologies"
"sharedmimeinfo"
];
in lib.fold (f: attrs: f attrs) json [
(lib.mapAttrs kdePackage)
(userEnvDeps user)
(nativeDeps native)
(propagateDeps propagated)
(renameDeps renames)
(lib.mapAttrs mirrorUrl)
];
scope =
# KDE Frameworks 5
kf5 //
# packages in this collection
self //
# packages pinned to this version of Qt 5
{
dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
libbluedevil = pkgs.libbluedevil.override { inherit qt5; };
phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
polkitqt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
poppler_qt5 = pkgs.poppler_qt5.override { inherit qt5; };
qt5 = qt5.base;
qt5core = qt5.base;
qt5dbus = qt5.base;
qt5gui = qt5.base;
qt5linguisttools = qt5.tools;
qt5qml = [qt5.declarative qt5.graphicaleffects];
qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
qt5script = qt5.script;
qt5svg = qt5.svg;
qt5tools = qt5.tools;
qt5webkitwidgets = qt5.webkit;
qt5widgets = qt5.base;
qt5x11extras = qt5.x11extras;
qt5xmlpatterns = qt5.xmlpatterns;
} //
# packages from nixpkgs
(with pkgs; {
inherit attr bash cairo cmake coreutils dbus epoxy exiv2 ffmpeg
freetype glib gnugrep gnused gtk2 gtk3 libinput libssh
modemmanager openconnect openexr pam pango qt4 samba
socat substituteAll taglib utillinux wayland xapian
xkeyboard_config xorg;
boost = boost155;
canberra = libcanberra;
epub = ebook_tools;
fontforge_executable = fontforge;
mobilebroadbandproviderinfo = mobile_broadband_provider_info;
mtp = libmtp;
pulseaudio = libpulseaudio;
qalculate = libqalculate;
shareddesktopontologies = shared_desktop_ontologies;
sharedmimeinfo = shared_mime_info;
usb = libusb;
});
self = super // {
bluez-qt = overrideDerivation super.bluez-qt (drv: {
preConfigure = ''
substituteInPlace CMakeLists.txt \
--replace /lib/udev/rules.d "$out/lib/udev/rules.d"
'';
});
breeze =
let
version = (builtins.parseDrvName super.breeze.name).version;
breeze-qt4 = overrideDerivation super.breeze (drv: {
name = "breeze-qt4-${version}";
buildInputs = [ pkgs.xorg.xproto pkgs.kde4.kdelibs pkgs.qt4 ];
nativeBuildInputs = [ pkgs.automoc4 scope.cmake pkgs.pkgconfig ];
cmakeFlags = [
"-DUSE_KDE4=ON"
"-DQT_QMAKE_EXECUTABLE=${scope.qt4}/bin/qmake"
];
});
breeze-qt5 = overrideDerivation super.breeze (drv: {
name = "breeze-qt5-${version}";
buildInputs = with kf5; with self; [
kcompletion kconfig kconfigwidgets kcoreaddons kdecoration
kguiaddons frameworkintegration ki18n kwindowsystem qt5.base
qt5.x11extras
];
nativeBuildInputs = [ scope.cmake kf5.extra-cmake-modules pkgs.pkgconfig ];
cmakeFlags = [ "-DUSE_KDE4=OFF" ];
});
in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ];
kde-gtk-config = extendDerivation super.kde-gtk-config {
NIX_CFLAGS_COMPILE = with scope;
lib.concatStringsSep " " [
"-I${cairo}/include/cairo"
"-I${gtk2}/include/gtk-2.0"
"-I${gtk2}/lib/gtk-2.0/include"
"-I${glib}/include/glib-2.0"
"-I${glib}/lib/glib-2.0/include"
"-I${pango}/include/pango-1.0"
];
};
kfilemetadata = extendDerivation super.kfilemetadata {
buildInputs = [ scope.attr ];
};
kwin = extendDerivation super.kwin {
buildInputs = with scope.xorg; [ libICE libSM libXcursor ];
patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
};
libkscreen = extendDerivation super.libkscreen {
buildInputs = [ scope.xorg.libXrandr];
};
plasma-desktop = extendDerivation super.plasma-desktop {
buildInputs = with scope;
[ canberra ]
++ (with xorg; [ libxkbfile libXcursor libXft ]);
patches = [
(scope.substituteAll {
src = ./plasma-desktop/plasma-desktop-hwclock.patch;
hwclock = "${scope.utillinux}/sbin/hwclock";
})
./plasma-desktop/plasma-desktop-zoneinfo.patch
(scope.substituteAll {
src = ./plasma-desktop/plasma-desktop-xkb-rules.patch;
xkb = scope.xkeyboard_config;
})
];
NIX_CFLAGS_COMPILE = with scope.xorg;
lib.concatStringsSep " " [
"-I${xf86inputsynaptics}/include/xorg"
"-I${xf86inputevdev}/include/xorg"
"-I${xorgserver}/include/xorg"
];
cmakeFlags = with scope.xorg; [
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include"
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include"
];
};
plasma-workspace = extendDerivation super.plasma-workspace {
patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
buildInputs = with scope.xorg; [ libSM libXcursor scope.pam ];
inherit (scope) bash coreutils gnused gnugrep socat;
inherit (scope) kconfig kinit kservice qt5tools;
inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
dbus_tools = scope.dbus.tools;
kde_workspace = kdeApps.kde-workspace;
postPatch = ''
substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
--replace kdostartupconfig5 $out/bin/kdostartupconfig5
substituteAllInPlace startkde/startkde.cmake
'';
};
powerdevil = extendDerivation super.powerdevil {
buildInputs = [ scope.xorg.libXrandr ];
};
sddm-kcm = extendDerivation super.sddm-kcm {
buildInputs = [ scope.xorg.libXcursor ];
};
};
in self

70
pkgs/desktops/plasma-5.3/kf5-renames.json
View File

@ -1,70 +0,0 @@
{
"kf5widgetsaddons": "kwidgetsaddons",
"kf5texteditor": "ktexteditor",
"kf5designerplugin": "kdesignerplugin",
"kf5bookmarks": "kbookmarks",
"kf5frameworkintegration": "frameworkintegration",
"kf5package": "kpackage",
"kf5archive": "karchive",
"kf5plasma": "plasma-framework",
"kf5kcmutils": "kcmutils",
"kf5configwidgets": "kconfigwidgets",
"ctest": "attica",
"kf5kio": "kio",
"kf5networkmanagerqt": "networkmanager-qt",
"kf5coreaddons": "kcoreaddons",
"kf5guiaddons": "kguiaddons",
"kf5jobwidgets": "kjobwidgets",
"kf5modemmanagerqt": "modemmanager-qt",
"kf5runner": "krunner",
"kf5globalaccel": "kglobalaccel",
"kf5dbusaddons": "kdbusaddons",
"kf5crash": "kcrash",
"kf5itemviews": "kitemviews",
"kf5doctools": "kdoctools",
"kf5i18n": "ki18n",
"kf5webkit": "kdewebkit",
"kf5newstuff": "knewstuff",
"kded": "kded",
"kf5notifications": "knotifications",
"kf5activitiesexperimentalstats": "kactivities",
"kf5dnssd": "kdnssd",
"kf5notifyconfig": "knotifyconfig",
"kf5iconthemes": "kiconthemes",
"kf5js": "kjs",
"kf5kde4support": "kdelibs4support",
"kf5parts": "kparts",
"backend": "plasma-framework",
"kf5completion": "kcompletion",
"kf5threadweaver": "threadweaver",
"kf5mediaplayer": "kmediaplayer",
"kf5plasmaquick": "plasma-framework",
"kf5wallet": "kwallet",
"kf5xmlgui": "kxmlgui",
"kf5attica": "attica",
"kf5declarative": "kdeclarative",
"kf5config": "kconfig",
"kf5init": "kinit",
"kf5textwidgets": "ktextwidgets",
"kf5jsembed": "kjsembed",
"kf5codecs": "kcodecs",
"kf5service": "kservice",
"kf5sonnet": "sonnet",
"kf5kdelibs4support": "kdelibs4support",
"kf5pty": "kpty",
"kf5solid": "solid",
"kf5auth": "kauth",
"ecm": "extra-cmake-modules",
"kf5activities": "kactivities",
"kf5plotting": "kplotting",
"kf5people": "kpeople",
"kf5emoticons": "kemoticons",
"kf5kross": "kross",
"kf5su": "kdesu",
"kf5khtml": "khtml",
"kf5unitconversion": "kunitconversion",
"kf5idletime": "kidletime",
"kf5windowsystem": "kwindowsystem",
"kf5xmlrpcclient": "kxmlrpcclient",
"kf5itemmodels": "kitemmodels"
}

13
pkgs/desktops/plasma-5.3/kwin/kwin-import-plugin-follow-symlinks.patch
View File

@ -1,13 +0,0 @@
diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
index 26b44a9..d14e226 100644
--- a/clients/aurorae/src/aurorae.cpp
+++ b/clients/aurorae/src/aurorae.cpp
@@ -73,7 +73,7 @@ void AuroraeFactory::init()
// so let's try to locate our plugin:
QString pluginPath;
for (const QString &path : m_engine->importPathList()) {
- QDirIterator it(path, QDirIterator::Subdirectories);
+ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
it.next();
QFileInfo fileInfo = it.fileInfo();

25
pkgs/desktops/plasma-5.3/kwin/libinput-0.8.patch
View File

@ -1,25 +0,0 @@
commit a93a2ab1918630c6d571b5a24379c15a0458d1fa
Author: Martin Gräßlin <mgraesslin@kde.org>
Date: Wed Jan 28 16:20:57 2015 +0100
Disable libinput integration if >= 0.8 is found
libinput 0.8 is incompatible causing the build to fail. As we are in
dependency freeze the only option is to disable the build.
BUG: 342893
FIXED-IN: 5.2.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 550ef57..8d9c593 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,7 +145,7 @@ set_package_properties(UDev PROPERTIES URL "http://www.freedesktop.org/software
PURPOSE "Required for input handling on Wayland."
)
set(HAVE_INPUT FALSE)
-if (Libinput_FOUND AND UDEV_FOUND)
+if (Libinput_FOUND AND UDEV_FOUND AND Libinput_VERSION VERSION_LESS 0.8)
set(HAVE_INPUT TRUE)
endif()

130
pkgs/desktops/plasma-5.3/libkscreen/libkscreen-backend-path.patch
View File

@ -1,130 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 460022f..422a708 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,7 @@
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
+configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h)
+
set(libkscreen_SRCS
backendloader.cpp
config.cpp
diff --git a/src/backendloader.cpp b/src/backendloader.cpp
index b93e469..8aebc14 100644
--- a/src/backendloader.cpp
+++ b/src/backendloader.cpp
@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
*************************************************************************************/
+#include "config-libkscreen.h"
#include "backendloader.h"
#include "debug_p.h"
#include "backends/abstractbackend.h"
@@ -40,55 +41,54 @@ bool BackendLoader::init()
const QString backend = qgetenv("KSCREEN_BACKEND").constData();
const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend);
- const QStringList paths = QCoreApplication::libraryPaths();
- Q_FOREACH (const QString &path, paths) {
- const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
- backendFilter,
- QDir::SortFlags(QDir::QDir::NoSort),
- QDir::NoDotAndDotDot | QDir::Files);
- const QFileInfoList finfos = dir.entryInfoList();
- Q_FOREACH (const QFileInfo &finfo, finfos) {
- // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
- if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
- continue;
- }
+ QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/");
- // When on X11, skip the QScreen backend, instead use the XRandR backend,
- // if not specified in KSCREEN_BACKEND
- if (backend.isEmpty() &&
- finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
- QX11Info::isPlatformX11()) {
- continue;
- }
+ const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
+ backendFilter,
+ QDir::SortFlags(QDir::QDir::NoSort),
+ QDir::NoDotAndDotDot | QDir::Files);
+ const QFileInfoList finfos = dir.entryInfoList();
+ Q_FOREACH (const QFileInfo &finfo, finfos) {
+ // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
+ if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
+ continue;
+ }
- // When not on X11, skip the XRandR backend, and fall back to QSCreen
- // if not specified in KSCREEN_BACKEND
- if (backend.isEmpty() &&
- finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
- !QX11Info::isPlatformX11()) {
- continue;
- }
+ // When on X11, skip the QScreen backend, instead use the XRandR backend,
+ // if not specified in KSCREEN_BACKEND
+ if (backend.isEmpty() &&
+ finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
+ QX11Info::isPlatformX11()) {
+ continue;
+ }
+
+ // When not on X11, skip the XRandR backend, and fall back to QSCreen
+ // if not specified in KSCREEN_BACKEND
+ if (backend.isEmpty() &&
+ finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
+ !QX11Info::isPlatformX11()) {
+ continue;
+ }
- QPluginLoader loader(finfo.filePath());
- loader.load();
- QObject *instance = loader.instance();
- if (!instance) {
+ QPluginLoader loader(finfo.filePath());
+ loader.load();
+ QObject *instance = loader.instance();
+ if (!instance) {
+ loader.unload();
+ continue;
+ }
+
+ s_backend = qobject_cast< AbstractBackend* >(instance);
+ if (s_backend) {
+ if (!s_backend->isValid()) {
+ qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
+ delete s_backend;
+ s_backend = 0;
loader.unload();
continue;
}
-
- s_backend = qobject_cast< AbstractBackend* >(instance);
- if (s_backend) {
- if (!s_backend->isValid()) {
- qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
- delete s_backend;
- s_backend = 0;
- loader.unload();
- continue;
- }
- qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
- return true;
- }
+ qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
+ return true;
}
}
diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake
new file mode 100644
index 0000000..a99f3d1
--- /dev/null
+++ b/src/config-libkscreen.h.cmake
@@ -0,0 +1,2 @@
+#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
+#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}"

10
pkgs/desktops/plasma-5.3/manifest.sh
View File

@ -1,10 +0,0 @@
#!/bin/sh
# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
# The extra slash at the end of the URL is necessary to stop wget
# from recursing over the whole server! (No, it's not a bug.)
$(nix-build ../../.. -A autonix.manifest) \
"${KDE_MIRROR}/stable/plasma/5.3.1/" \
$MANIFEST_EXTRA_ARGS -A '*.tar.xz'

1358
pkgs/desktops/plasma-5.3/packages.json
View File

File diff suppressed because it is too large Load Diff

22
pkgs/desktops/plasma-5.3/packages.sh
View File

@ -1,22 +0,0 @@
#!/bin/sh
set -x
origin="$(pwd)"
# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
alias nix-build="nix-build --no-out-link \"$origin/../../..\""
# The extra slash at the end of the URL is necessary to stop wget
# from recursing over the whole server! (No, it's not a bug.)
$(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/plasma/5.3.2/" \
"$@" -A '*.tar.xz'
AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
$AUTONIX_DEPS_KF5 manifest.json
rm manifest.json

24
pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-hwclock.patch
View File

@ -1,24 +0,0 @@
diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
index cec5ab8..fc4a6b9 100644
--- a/kcms/dateandtime/helper.cpp
+++ b/kcms/dateandtime/helper.cpp
@@ -48,10 +48,6 @@
#include <sys/stat.h>
#endif
-// We cannot rely on the $PATH environment variable, because D-Bus activation
-// clears it. So we have to use a reasonable default.
-static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin");
-
int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
{
int ret = 0;
@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
void ClockHelper::toHwclock()
{
- QString hwclock = KStandardDirs::findExe("hwclock", exePath);
+ QString hwclock = "@hwclock@";
if (!hwclock.isEmpty()) {
KProcess::execute(hwclock, QStringList() << "--systohc");
}

47
pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-xkb-rules.patch
View File

@ -1,47 +0,0 @@
From 3f175a5ecc9b4fecd8fe25cb482cf2c91aa47cf6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 4 May 2015 22:23:21 -0500
Subject: [PATCH] xkb rules path
---
kcms/keyboard/xkb_rules.cpp | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/kcms/keyboard/xkb_rules.cpp b/kcms/keyboard/xkb_rules.cpp
index 341369d..27066d6 100644
--- a/kcms/keyboard/xkb_rules.cpp
+++ b/kcms/keyboard/xkb_rules.cpp
@@ -157,29 +157,7 @@ QString Rules::getRulesName()
QString Rules::findXkbDir()
{
- QString xkbParentDir;
-
- QString base(XLIBDIR);
- if( base.count('/') >= 3 ) {
- // .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /usr/X11/share/X11/xkb
- QString delta = base.endsWith("X11") ? "/../../share/X11" : "/../share/X11";
- QDir baseDir(base + delta);
- if( baseDir.exists() ) {
- xkbParentDir = baseDir.absolutePath();
- }
- else {
- QDir baseDir(base + "/X11"); // .../usr/X11/lib/X11/xkb (old XFree)
- if( baseDir.exists() ) {
- xkbParentDir = baseDir.absolutePath();
- }
- }
- }
-
- if( xkbParentDir.isEmpty() ) {
- xkbParentDir = "/usr/share/X11";
- }
-
- return xkbParentDir + "/xkb";
+ return "@xkb@/share/X11/xkb";
}
static QString findXkbRulesFile()
--
2.3.6

18
pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-zoneinfo.patch
View File

@ -1,18 +0,0 @@
diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
index fc4a6b9..7b64d05 100644
--- a/kcms/dateandtime/helper.cpp
+++ b/kcms/dateandtime/helper.cpp
@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
val = selectedzone;
#else
- QString tz = "/usr/share/zoneinfo/" + selectedzone;
+ // NixOS-specific path
+ QString tz = "/etc/zoneinfo/" + selectedzone;
+ if (!QFile::exists(tz)) {
+ // Standard Linux path
+ tz = "/usr/share/zoneinfo/" + selectedzone;
+ }
if (QFile::exists(tz)) { // make sure the new TZ really exists
QFile::remove("/etc/localtime");

411
pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
View File

@ -1,411 +0,0 @@
From f124d2204cff11ae0ff0d6c788d268b746180407 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 18 Jul 2015 12:13:08 -0500
Subject: [PATCH] startkde NixOS patches
---
startkde/startkde.cmake | 222 ++++++++++++++++++++----------------------------
1 file changed, 91 insertions(+), 131 deletions(-)
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 6f93108..26cc2fc 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -1,8 +1,31 @@
-#!/bin/sh
+#!@bash@/bin/bash
#
# DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
#
+set -x
+
+# The KDE icon cache is supposed to update itself
+# automatically, but it uses the timestamp on the icon
+# theme directory as a trigger. Since in Nix the
+# timestamp is always the same, this doesn't work. So as
+# a workaround, nuke the icon cache on login. This isn't
+# perfect, since it may require logging out after
+# installing new applications to update the cache.
+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
+rm -fv $HOME/.cache/icon-cache.kcache
+
+# Qt writes a weird ‘libraryPath’ line to
+# ~/.config/Trolltech.conf that causes the KDE plugin
+# paths of previous KDE invocations to be searched.
+# Obviously using mismatching KDE libraries is potentially
+# disastrous, so here we nuke references to the Nix store
+# in Trolltech.conf. A better solution would be to stop
+# Qt from doing this wackiness in the first place.
+if [ -e $HOME/.config/Trolltech.conf ]; then
+ @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
+fi
+
if test "x$1" = x--failsafe; then
KDE_FAILSAFE=1 # General failsafe flag
KWIN_COMPOSE=N # Disable KWin's compositing
@@ -16,29 +39,16 @@ trap 'echo GOT SIGHUP' HUP
# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
unset DYLD_FORCE_FLAT_NAMESPACE
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
- qbindir=`qtpaths --binaries-dir`
- qdbus=$qbindir/qdbus
- case $PATH in
- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
- *) PATH=$bindir:$PATH; export PATH;;
- esac
-else
- qdbus=qdbus
-fi
-
# Check if a KDE session already is running and whether it's possible to connect to X
-kcheckrunning
+@out@/bin/kcheckrunning
kcheckrunning_result=$?
if test $kcheckrunning_result -eq 0 ; then
- echo "KDE seems to be already running on this display."
- xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
+ echo "KDE seems to be already running on this display."
+ @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display."
exit 1
elif test $kcheckrunning_result -eq 2 ; then
echo "\$DISPLAY is not set or cannot connect to the X server."
- exit 1
+ exit 1
fi
# Boot sequence:
@@ -56,13 +66,8 @@ fi
# * Then ksmserver is started which takes control of the rest of the startup sequence
# We need to create config folder so we can write startupconfigkeys
-if [ ${XDG_CONFIG_HOME} ]; then
- configDir=$XDG_CONFIG_HOME;
-else
- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-fi
-
-mkdir -p $configDir
+configDir=$(@qt5tools@/bin/qtpaths --writable-path GenericConfigLocation)
+mkdir -p "$configDir"
#This is basically setting defaults so we can use them with kstartupconfig5
cat >$configDir/startupconfigkeys <<EOF
@@ -106,55 +111,21 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
EOF
}
-# Make sure the Oxygen font is installed
-# This is necessary for setups where CMAKE_INSTALL_PREFIX
-# is not in /usr. fontconfig looks in /usr, ~/.fonts and
-# $XDG_DATA_HOME for fonts. In this case, we symlink the
-# Oxygen font under ${XDG_DATA_HOME} and make it known to
-# fontconfig
-
-usr_share="/usr/share"
-install_share="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@"
-
-if [ ! $install_share = $usr_share ]; then
-
- if [ ${XDG_DATA_HOME} ]; then
- fontsDir="${XDG_DATA_HOME}/fonts"
- else
- fontsDir="${HOME}/.fonts"
- fi
-
- test -d $fontsDir || {
- mkdir -p $fontsDir
- }
-
- oxygenDir=$fontsDir/oxygen
- prefixDir="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@/fonts/oxygen"
-
- # if the oxygen dir doesn't exist, create a symlink to be sure that the
- # Oxygen font is available to the user
- test -d $oxygenDir || test -d $prefixDir && {
- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
- }
-fi
-
-kstartupconfig5
+@out@/bin/kstartupconfig5
returncode=$?
if test $returncode -ne 0; then
- xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
+ @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
exit 1
fi
[ -r $configDir/startupconfig ] && . $configDir/startupconfig
-if test "$kdeglobals_kscreen_scalefactor" -ne 1; then
- export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
-fi
+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @coreutils@/bin/tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | @coreutils@/bin/tr "\n" ":")
+export XCURSOR_PATH
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
- @EXPORT_XCURSOR_PATH@
- kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+ @kde_workspace@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
if test $? -eq 10; then
XCURSOR_THEME=breeze_cursors
export XCURSOR_THEME
@@ -168,21 +139,39 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
fi
fi
-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
- xrdb -quiet -merge -nocpp <<EOF
-Xft.dpi: $kcmfonts_general_forcefontdpi
-EOF
-fi
+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+# from some users that they're confused and don't know what to do. This is
+# especially necessary on slow machines, where starting KDE takes one or two
+# minutes until anything appears on the screen.
+#
+# If the user has overwritten fonts, the cursor font may be different now
+# so don't move this up.
+#
+@xsetroot@/bin/xsetroot -cursor_name left_ptr
dl=$DESKTOP_LOCKED
unset DESKTOP_LOCKED # Don't want it in the environment
+# Make sure that D-Bus is running
+# D-Bus autolaunch is broken
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+ eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
+fi
+if @qt5tools@/bin/qdbus >/dev/null 2>/dev/null; then
+ : # ok
+else
+ echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+ exit 1
+fi
+
ksplash_pid=
if test -z "$dl"; then
# the splashscreen and progress indicator
case "$ksplashrc_ksplash_engine" in
KSplashQML)
- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid`
+ ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
;;
None)
;;
@@ -205,8 +194,7 @@ fi
# For anything else (that doesn't set env vars, or that needs a window manager),
# better use the Autostart folder.
-# TODO: Use GenericConfigLocation once we depend on Qt 5.4
-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
+scriptpath=$(@qt5tools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g')
# Add /env/ to the directory to locate the scripts to be sourced
for prefix in `echo $scriptpath`; do
@@ -216,7 +204,7 @@ for prefix in `echo $scriptpath`; do
done
# Set the path for Qt plugins provided by KDE
-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5tools@/bin/qtpaths --plugin-dir`
# TODO: Do we really need this?
QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
export QT_PLUGIN_PATH
@@ -242,7 +230,7 @@ usr_odir=$HOME/.fonts/kde-override
usr_fdir=$HOME/.fonts
if test -n "$KDEDIRS"; then
- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
+ kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'`
sys_odir=$kdedirs_first/share/fonts/override
sys_fdir=$kdedirs_first/share/fonts
else
@@ -255,23 +243,13 @@ fi
# add the user's dirs to the font path, as they might simply have been made
# read-only by the administrator, for whatever reason.
-test -d "$sys_odir" && xset +fp "$sys_odir"
-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
+test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir"
+test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" )
+test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" )
+test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir"
# Ask X11 to rebuild its font list.
-xset fp rehash
-
-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
-# from some users that they're confused and don't know what to do. This is
-# especially necessary on slow machines, where starting KDE takes one or two
-# minutes until anything appears on the screen.
-#
-# If the user has overwritten fonts, the cursor font may be different now
-# so don't move this up.
-#
-xsetroot -cursor_name left_ptr
+@xset@/bin/xset fp rehash
# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
if test -n "$GS_LIB" ; then
@@ -284,30 +262,6 @@ fi
echo 'startkde: Starting up...' 1>&2
-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
-# /usr/local.
-if test -z "$XDG_DATA_DIRS"; then
- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
-fi
-export XDG_DATA_DIRS
-
-# Make sure that D-Bus is running
-# D-Bus autolaunch is broken
-if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
- eval `dbus-launch --sh-syntax --exit-with-session`
-fi
-if $qdbus >/dev/null 2>/dev/null; then
- : # ok
-else
- echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
- exit 1
-fi
-
-
# Mark that full KDE session is running (e.g. Konqueror preloading works only
# with full KDE running). The KDE_FULL_SESSION property can be detected by
# any X client connected to the same X session, even if not launched
@@ -332,11 +286,11 @@ fi
#
KDE_FULL_SESSION=true
export KDE_FULL_SESSION
-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
KDE_SESSION_VERSION=5
export KDE_SESSION_VERSION
-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
KDE_SESSION_UID=`id -ru`
export KDE_SESSION_UID
@@ -346,30 +300,36 @@ export XDG_CURRENT_DESKTOP
# At this point all the environment is ready, let's send it to kwalletd if running
if test -n "$PAM_KWALLET_LOGIN" ; then
- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
+ env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
fi
-# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+# At this point all environment variables are set, let's send it to the DBus
+# session server to update the activation environment
@CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
if test $? -ne 0; then
# Startup error
echo 'startkde: Could not sync environment to dbus.' 1>&2
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
- xmessage -geometry 500x100 "Could not sync environment to dbus."
+ @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus."
exit 1
fi
# We set LD_BIND_NOW to increase the efficiency of kdeinit.
# kdeinit unsets this variable before loading applications.
-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
+LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
if test $? -ne 0; then
# Startup error
echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation"
exit 1
fi
+# (NixOS) We run kbuildsycoca5 before starting the user session because things
+# may be missing or moved if they have run nixos-rebuild and it may not be
+# possible for them to start Konsole to run it manually!
+@kservice@/bin/kbuildsycoca5
+
# finally, give the session control to the session manager
# see kdebase/ksmserver for the description of the rest of the startup sequence
# if the KDEWM environment variable has been set, then it will be used as KDE's
@@ -385,27 +345,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
# lock now and do the rest of the KDE startup underneath the locker.
KSMSERVEROPTIONS=""
test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
-kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
+@kinit@/bin/kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
if test $? -eq 255; then
# Startup error
echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
fi
-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
+wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
if test x"$wait_drkonqi"x = x"true"x ; then
# wait for remaining drkonqi instances with timeout (in seconds)
- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
+ wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
wait_drkonqi_counter=0
- while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
+ while @qt5tools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
sleep 5
wait_drkonqi_counter=$((wait_drkonqi_counter+5))
if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
# ask remaining drkonqis to die in a graceful way
- $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
- $qdbus "$address" "/MainApplication" "quit"
+ @qt5tools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
+ @qt5tools@/bin/qdbus "$address" "/MainApplication" "quit"
done
break
fi
@@ -417,21 +377,21 @@ echo 'startkde: Shutting down...' 1>&2
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
# Clean up
-kdeinit5_shutdown
+@kinit@/bin/kdeinit5_shutdown
echo 'startkde: Running shutdown scripts...' 1>&2
# Run scripts found in <config locations>/plasma-workspace/shutdown
for prefix in `echo "$scriptpath"`; do
- for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do
+ for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file"
done
done
unset KDE_FULL_SESSION
-xprop -root -remove KDE_FULL_SESSION
+@xprop@/bin/xprop -root -remove KDE_FULL_SESSION
unset KDE_SESSION_VERSION
-xprop -root -remove KDE_SESSION_VERSION
+@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION
unset KDE_SESSION_UID
echo 'startkde: Done.' 1>&2
--
2.4.5

20
pkgs/desktops/plasma-5.3/renames.json
View File

@ -1,20 +0,0 @@
{
"kf5sysguard": "libksysguard",
"kf5baloo": "baloo",
"krunnerappdbusinterface": "plasma-workspace",
"screensaverdbusinterface": "plasma-workspace",
"ctest": "kdeplasma-addons",
"kf5filemetadata": "kfilemetadata",
"kwindbusinterface": "kwin",
"kf5activitiesexperimentalstats": "plasma-desktop",
"khotkeysdbusinterface": "khotkeys",
"libkworkspace": "plasma-workspace",
"libtaskmanager": "plasma-workspace",
"backend": "powerdevil",
"kf5screen": "libkscreen",
"ksmserverdbusinterface": "plasma-workspace",
"kf5wayland": "kwayland",
"kdecoration2": "kdecoration",
"kf5bluezqt": "bluez-qt",
"oxygenfont": "oxygen-fonts"
}

1
pkgs/desktops/plasma-5.3/setup-hook.sh
View File

@ -1 +0,0 @@
addToSearchPath XDG_DATA_DIRS @out@/share

42
pkgs/desktops/plasma-5.4/bluedevil.nix
View File

@ -1,39 +1,23 @@
{ plasmaPackage
, extra-cmake-modules
, bluez-qt
, kcoreaddons
, kdbusaddons
, kded
, ki18n
, kiconthemes
, kio
, knotifications
, kwidgetsaddons
, kwindowsystem
, plasma-framework
, qtdeclarative
, shared_mime_info
{ plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons
, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications
, kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework
, qtdeclarative, shared_mime_info
}:
plasmaPackage {
name = "bluedevil";
nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
nativeBuildInputs = [
extra-cmake-modules makeQtWrapper shared_mime_info
];
buildInputs = [
bluez-qt
kcoreaddons
kdbusaddons
kded
ki18n
kiconthemes
kio
knotifications
kcoreaddons kdbusaddons kded kiconthemes knotifications
kwidgetsaddons
kwindowsystem
plasma-framework
qtdeclarative
];
propagatedBuildInputs = [
bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
];
postInstall = ''
wrapKDEProgram "$out/bin/bluedevil-wizard"
wrapKDEProgram "$out/bin/bluedevil-sendfile"
wrapQtProgram "$out/bin/bluedevil-wizard"
wrapQtProgram "$out/bin/bluedevil-sendfile"
'';
}

30
pkgs/desktops/plasma-5.4/breeze-qt5.nix
View File

@ -1,14 +1,6 @@
{ plasmaPackage
, extra-cmake-modules
, frameworkintegration
, kcmutils
, kconfigwidgets
, kcoreaddons
, kdecoration
, kguiaddons
, ki18n
, kwindowsystem
, qtx11extras
{ plasmaPackage, extra-cmake-modules, frameworkintegration
, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons
, ki18n, kwindowsystem, makeQtWrapper, qtx11extras
}:
plasmaPackage {
@ -16,20 +8,14 @@ plasmaPackage {
sname = "breeze";
nativeBuildInputs = [
extra-cmake-modules
makeQtWrapper
];
buildInputs = [
frameworkintegration
kcmutils
kconfigwidgets
kcoreaddons
kdecoration
kguiaddons
ki18n
kwindowsystem
qtx11extras
kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
];
cmakeFlags = [ "-DUSE_KDE4=OFF" ];
propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
cmakeFlags = [ "-DUSE_Qt4=OFF" ];
postInstall = ''
wrapKDEProgram "$out/bin/breeze-settings5"
wrapQtProgram "$out/bin/breeze-settings5"
'';
}

6
pkgs/desktops/plasma-5.4/default.nix
View File

@ -51,7 +51,7 @@ let
let version = (builtins.parseDrvName breeze-qt5.name).version;
in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ];
kde-cli-tools = callPackage ./kde-cli-tools.nix {};
kde-gtk-config = callPackage ./kde-gtk-config.nix {};
kde-gtk-config = callPackage ./kde-gtk-config {};
kdecoration = callPackage ./kdecoration.nix {};
kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
kgamma5 = callPackage ./kgamma5.nix {};
@ -66,13 +66,13 @@ let
kwin = callPackage ./kwin {};
kwrited = callPackage ./kwrited.nix {};
libkscreen = callPackage ./libkscreen {};
libksysguard = callPackage ./libksysguard.nix {};
libksysguard = callPackage ./libksysguard {};
milou = callPackage ./milou.nix {};
oxygen = callPackage ./oxygen.nix {};
oxygen-fonts = callPackage ./oxygen-fonts.nix {};
plasma-desktop = callPackage ./plasma-desktop {};
plasma-mediacenter = callPackage ./plasma-mediacenter.nix {};
plasma-nm = callPackage ./plasma-nm.nix {};
plasma-nm = callPackage ./plasma-nm {};
plasma-pa = callPackage ./plasma-pa.nix {};
plasma-workspace = callPackage ./plasma-workspace {};
plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};

50
pkgs/desktops/plasma-5.4/kde-cli-tools.nix
View File

@ -1,41 +1,27 @@
{ plasmaPackage
, extra-cmake-modules
, kcmutils
, kconfig
, kdelibs4support
, kdesu
, kdoctools
, ki18n
, kiconthemes
, kwindowsystem
, qtsvg
, qtx11extras
{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig
, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes
, kwindowsystem, makeQtWrapper, qtsvg, qtx11extras
}:
plasmaPackage {
name = "kde-cli-tools";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [
kcmutils
kconfig
kdelibs4support
kdesu
ki18n
kiconthemes
kwindowsystem
qtsvg
qtx11extras
kcmutils kconfig kdesu kiconthemes
];
propagatedBuildInputs = [
kdelibs4support ki18n kwindowsystem qtsvg qtx11extras
];
postInstall = ''
wrapKDEProgram "$out/bin/kmimetypefinder5"
wrapKDEProgram "$out/bin/ksvgtopng5"
wrapKDEProgram "$out/bin/ktraderclient5"
wrapKDEProgram "$out/bin/kioclient5"
wrapKDEProgram "$out/bin/kdecp5"
wrapKDEProgram "$out/bin/keditfiletype5"
wrapKDEProgram "$out/bin/kcmshell5"
wrapKDEProgram "$out/bin/kdemv5"
wrapKDEProgram "$out/bin/kstart5"
wrapKDEProgram "$out/bin/kde-open5"
wrapQtProgram "$out/bin/kmimetypefinder5"
wrapQtProgram "$out/bin/ksvgtopng5"
wrapQtProgram "$out/bin/ktraderclient5"
wrapQtProgram "$out/bin/kioclient5"
wrapQtProgram "$out/bin/kdecp5"
wrapQtProgram "$out/bin/keditfiletype5"
wrapQtProgram "$out/bin/kcmshell5"
wrapQtProgram "$out/bin/kdemv5"
wrapQtProgram "$out/bin/kstart5"
wrapQtProgram "$out/bin/kde-open5"
'';
}

39
pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch Normal file
View File

@ -0,0 +1,39 @@
From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 27 Oct 2015 18:07:54 -0500
Subject: [PATCH] follow symlinks
---
src/appearancegtk2.cpp | 2 +-
src/iconthemesmodel.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
index b1e0b52..095cddc 100644
--- a/src/appearancegtk2.cpp
+++ b/src/appearancegtk2.cpp
@@ -73,7 +73,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
QStringList themes=installedThemes();
themes=themes.filter(QRegExp("/"+themeName+"/?$"));
if(themes.size()==1) {
- QDirIterator it(themes.first(), QDirIterator::Subdirectories);
+ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while(it.hasNext()) {
it.next();
if(it.fileName()=="gtkrc") {
diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp
index 07c7ad7..b04d978 100644
--- a/src/iconthemesmodel.cpp
+++ b/src/iconthemesmodel.cpp
@@ -46,7 +46,7 @@ QList<QDir> IconThemesModel::installedThemesPaths()
foreach(const QString& dir, dirs) {
QDir userIconsDir(dir);
- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
while(it.hasNext()) {
QString currentPath = it.next();
QDir dir(currentPath);
--
2.6.2

6
pkgs/desktops/plasma-5.4/kde-gtk-config.nix → pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix
View File

@ -14,11 +14,13 @@
plasmaPackage {
name = "kde-gtk-config";
patches = [ ./0001-follow-symlinks.patch ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
glib gtk2 gtk3 karchive kcmutils kconfigwidgets ki18n kiconthemes
kio knewstuff
glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
knewstuff
];
propagatedBuildInputs = [ ki18n kio ];
cmakeFlags = [
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"

43
pkgs/desktops/plasma-5.4/kdeplasma-addons.nix
View File

@ -1,22 +1,7 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, ibus
, kconfig
, kconfigwidgets
, kcoreaddons
, kcmutils
, kdelibs4support
, ki18n
, kio
, knewstuff
, kross
, krunner
, kservice
, kunitconversion
, plasma-framework
, qtdeclarative
, qtx11extras
{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig
, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
, kio, knewstuff, kross, krunner, kservice, kunitconversion
, plasma-framework, qtdeclarative, qtx11extras
}:
plasmaPackage {
@ -26,21 +11,11 @@ plasmaPackage {
kdoctools
];
buildInputs = [
ibus
kconfig
kconfigwidgets
kcoreaddons
kcmutils
kdelibs4support
ki18n
kio
knewstuff
kross
krunner
kservice
kunitconversion
plasma-framework
qtdeclarative
ibus kconfig kconfigwidgets kcoreaddons kcmutils
knewstuff kservice kunitconversion
];
propagatedBuildInputs = [
kdelibs4support kio kross krunner plasma-framework qtdeclarative
qtx11extras
];
}

15
pkgs/desktops/plasma-5.4/kgamma5.nix
View File

@ -1,18 +1,9 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, kdelibs4support
{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support
, qtx11extras
}:
plasmaPackage {
name = "kgamma5";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
kdelibs4support
qtx11extras
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kdelibs4support qtx11extras ];
}

29
pkgs/desktops/plasma-5.4/khelpcenter.nix
View File

@ -1,15 +1,6 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, kconfig
, kcoreaddons
, kdbusaddons
, ki18n
, kinit
, kcmutils
, kdelibs4support
, khtml
, kservice
{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support
, khtml, kservice, makeQtWrapper
}:
plasmaPackage {
@ -17,19 +8,13 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
kconfig
kcoreaddons
kdbusaddons
ki18n
kinit
kcmutils
kdelibs4support
khtml
kservice
kconfig kcoreaddons kdbusaddons kinit kcmutils kservice
];
propagatedBuildInputs = [ kdelibs4support khtml ki18n ];
postInstall = ''
wrapKDEProgram "$out/bin/khelpcenter"
wrapQtProgram "$out/bin/khelpcenter"
'';
}

36
pkgs/desktops/plasma-5.4/khotkeys.nix
View File

@ -1,34 +1,16 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, kcmutils
, kdbusaddons
, kdelibs4support
, kglobalaccel
, ki18n
, kio
, kxmlgui
, plasma-framework
, plasma-workspace
, qtx11extras
{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
, plasma-framework, plasma-workspace, qtx11extras
}:
plasmaPackage {
name = "khotkeys";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils
kdbusaddons
kdelibs4support
kglobalaccel
ki18n
kio
kxmlgui
plasma-framework
plasma-workspace
qtx11extras
kcmutils kdbusaddons kxmlgui
];
propagatedBuildInputs = [
kdelibs4support kglobalaccel ki18n kio plasma-framework
plasma-workspace qtx11extras
];
}

51
pkgs/desktops/plasma-5.4/kinfocenter.nix
View File

@ -1,24 +1,8 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, kcmutils
, kcompletion
, kconfig
, kconfigwidgets
, kcoreaddons
, kdbusaddons
, kdeclarative
, kdelibs4support
, ki18n
, kiconthemes
, kio
, kpackage
, kservice
, kwidgetsaddons
, kxmlgui
, libraw1394
, pciutils
, solid
{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons
, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage
, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeQtWrapper
, pciutils, solid
}:
plasmaPackage {
@ -26,28 +10,15 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
kcmutils
kcompletion
kconfig
kconfigwidgets
kcoreaddons
kdbusaddons
kdeclarative
kdelibs4support
ki18n
kiconthemes
kio
kpackage
kservice
kwidgetsaddons
kxmlgui
libraw1394
pciutils
solid
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
kdbusaddons kiconthemes kpackage kservice kwidgetsaddons
kxmlgui libraw1394 pciutils solid
];
propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ];
postInstall = ''
wrapKDEProgram "$out/bin/kinfocenter"
wrapQtProgram "$out/bin/kinfocenter"
'';
}

24
pkgs/desktops/plasma-5.4/kmenuedit.nix
View File

@ -1,13 +1,5 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, ki18n
, kxmlgui
, kdbusaddons
, kiconthemes
, kio
, sonnet
, kdelibs4support
{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui
, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper
}:
plasmaPackage {
@ -15,17 +7,13 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
ki18n
kxmlgui
kdbusaddons
kiconthemes
kio
sonnet
kdelibs4support
kxmlgui kdbusaddons kiconthemes
];
propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ];
postInstall = ''
wrapKDEProgram "$out/bin/kmenuedit"
wrapQtProgram "$out/bin/kmenuedit"
'';
}

28
pkgs/desktops/plasma-5.4/kscreen.nix
View File

@ -1,33 +1,19 @@
{ plasmaPackage
, extra-cmake-modules
, kconfig
, kconfigwidgets
, kdbusaddons
, kglobalaccel
, ki18n
, kwidgetsaddons
, kxmlgui
, libkscreen
, qtdeclarative
{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
, libkscreen, makeQtWrapper, qtdeclarative
}:
plasmaPackage {
name = "kscreen";
nativeBuildInputs = [
extra-cmake-modules
makeQtWrapper
];
buildInputs = [
kconfig
kconfigwidgets
kdbusaddons
kglobalaccel
ki18n
kwidgetsaddons
kxmlgui
libkscreen
qtdeclarative
kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
];
propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ];
postInstall = ''
wrapKDEProgram "$out/bin/kscreen-console"
wrapQtProgram "$out/bin/kscreen-console"
'';
}

24
pkgs/desktops/plasma-5.4/ksshaskpass.nix
View File

@ -1,25 +1,13 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, kcoreaddons
, ki18n
, kwallet
, kwidgetsaddons
{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
, ki18n, kwallet, kwidgetsaddons, makeQtWrapper
}:
plasmaPackage {
name = "ksshaskpass";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
kcoreaddons
ki18n
kwallet
kwidgetsaddons
];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [ kcoreaddons kwallet kwidgetsaddons ];
propagatedBuildInputs = [ ki18n ];
postInstall = ''
wrapKDEProgram "$out/bin/ksshaskpass"
wrapQtProgram "$out/bin/ksshaskpass"
'';
}

29
pkgs/desktops/plasma-5.4/ksysguard.nix
View File

@ -1,14 +1,6 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, kconfig
, kcoreaddons
, kdelibs4support
, ki18n
, kitemviews
, knewstuff
, kiconthemes
, libksysguard
{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
, kiconthemes, libksysguard, makeQtWrapper
}:
plasmaPackage {
@ -16,19 +8,14 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
kconfig
kcoreaddons
kdelibs4support
ki18n
kitemviews
knewstuff
kiconthemes
libksysguard
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
];
propagatedBuildInputs = [ kdelibs4support ki18n ];
postInstall = ''
wrapKDEProgram "$out/bin/ksysguardd"
wrapKDEProgram "$out/bin/ksysguard"
wrapQtProgram "$out/bin/ksysguardd"
wrapQtProgram "$out/bin/ksysguard"
'';
}

16
pkgs/desktops/plasma-5.4/kwin/kwin-import-plugin-follow-symlinks.patch → pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch
View File

@ -1,8 +1,17 @@
From 78a4b554187c18fd86b62089f7730c4273fadd4c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 07:05:22 -0500
Subject: [PATCH] qdiriterator follow symlinks
---
clients/aurorae/src/aurorae.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
index 26b44a9..d14e226 100644
index 781c960..ad5f420 100644
--- a/clients/aurorae/src/aurorae.cpp
+++ b/clients/aurorae/src/aurorae.cpp
@@ -73,7 +73,7 @@ void AuroraeFactory::init()
@@ -211,7 +211,7 @@ void Helper::init()
// so let's try to locate our plugin:
QString pluginPath;
for (const QString &path : m_engine->importPathList()) {
@ -11,3 +20,6 @@ index 26b44a9..d14e226 100644
while (it.hasNext()) {
it.next();
QFileInfo fileInfo = it.fileInfo();
--
2.5.2

92
pkgs/desktops/plasma-5.4/kwin/default.nix
View File

@ -1,39 +1,11 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, epoxy
, kactivities
, kcompletion
, kcmutils
, kconfig
, kconfigwidgets
, kcoreaddons
, kcrash
, kdeclarative
, kdecoration
, kglobalaccel
, ki18n
, kiconthemes
, kinit
, kio
, knewstuff
, knotifications
, kpackage
, kservice
, kwayland
, kwidgetsaddons
, kwindowsystem
, kxmlgui
, libinput
, libICE
, libSM
, plasma-framework
, qtdeclarative
, qtscript
, qtx11extras
, udev
, wayland
, xcb-util-cursor
{ plasmaPackage, extra-cmake-modules, kdoctools, epoxy
, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets
, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel
, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications
, kpackage, kservice, kwayland, kwidgetsaddons, kwindowsystem
, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative
, qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor
, makeQtWrapper
}:
plasmaPackage {
@ -41,45 +13,21 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
epoxy
kactivities
kcompletion
kcmutils
kconfig
kconfigwidgets
kcoreaddons
kcrash
kdeclarative
kdecoration
kglobalaccel
ki18n
kiconthemes
kinit
kio
knewstuff
knotifications
kpackage
kservice
kwayland
kwidgetsaddons
kwindowsystem
kxmlgui
libinput
libICE
libSM
plasma-framework
qtdeclarative
qtscript
qtx11extras
udev
wayland
xcb-util-cursor
epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
kcrash kdecoration kiconthemes kinit knewstuff knotifications
kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE
libSM qtscript udev wayland xcb-util-cursor
];
patches = [ ./kwin-import-plugin-follow-symlinks.patch ];
propagatedBuildInputs = [
kactivities kdeclarative kglobalaccel ki18n kio kwindowsystem
plasma-framework qtdeclarative qtmultimedia qtx11extras
];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
postInstall = ''
wrapKDEProgram "$out/bin/kwin_x11"
wrapKDEProgram "$out/bin/kwin_wayland"
wrapQtProgram "$out/bin/kwin_x11"
wrapQtProgram "$out/bin/kwin_wayland"
'';
}

25
pkgs/desktops/plasma-5.4/kwin/libinput-0.8.patch
View File

@ -1,25 +0,0 @@
commit a93a2ab1918630c6d571b5a24379c15a0458d1fa
Author: Martin Gräßlin <mgraesslin@kde.org>
Date: Wed Jan 28 16:20:57 2015 +0100
Disable libinput integration if >= 0.8 is found
libinput 0.8 is incompatible causing the build to fail. As we are in
dependency freeze the only option is to disable the build.
BUG: 342893
FIXED-IN: 5.2.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 550ef57..8d9c593 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,7 +145,7 @@ set_package_properties(UDev PROPERTIES URL "http://www.freedesktop.org/software
PURPOSE "Required for input handling on Wayland."
)
set(HAVE_INPUT FALSE)
-if (Libinput_FOUND AND UDEV_FOUND)
+if (Libinput_FOUND AND UDEV_FOUND AND Libinput_VERSION VERSION_LESS 0.8)
set(HAVE_INPUT TRUE)
endif()

22
pkgs/desktops/plasma-5.4/kwrited.nix
View File

@ -1,22 +1,10 @@
{ plasmaPackage
, extra-cmake-modules
, kcoreaddons
, ki18n
, kpty
, knotifications
, kdbusaddons
{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty
, knotifications, kdbusaddons
}:
plasmaPackage {
name = "kwrited";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
kcoreaddons
ki18n
kpty
knotifications
kdbusaddons
];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ];
propagatedBuildInputs = [ ki18n ];
}

2
pkgs/desktops/plasma-5.4/libkscreen/default.nix
View File

@ -11,6 +11,8 @@ plasmaPackage {
];
buildInputs = [
libXrandr
];
propagatedBuildInputs = [
qtx11extras
];
}

42
pkgs/desktops/plasma-5.4/libksysguard.nix
View File

@ -1,42 +0,0 @@
{ plasmaPackage
, extra-cmake-modules
, kauth
, kcompletion
, kconfigwidgets
, kcoreaddons
, kservice
, kwidgetsaddons
, kwindowsystem
, plasma-framework
, qtscript
, qtwebkit
, qtx11extras
, kconfig
, ki18n
, kiconthemes
}:
plasmaPackage {
name = "libksysguard";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
kauth
kcompletion
kconfigwidgets
kcoreaddons
kservice
kwidgetsaddons
kwindowsystem
plasma-framework
qtscript
qtwebkit
qtx11extras
];
propagatedBuildInputs = [
kconfig
ki18n
kiconthemes
];
}

25
pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch Normal file
View File

@ -0,0 +1,25 @@
From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 07:07:22 -0500
Subject: [PATCH] qdiriterator follow symlinks
---
processui/scripting.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/processui/scripting.cpp b/processui/scripting.cpp
index efed8ff..841761a 100644
--- a/processui/scripting.cpp
+++ b/processui/scripting.cpp
@@ -167,7 +167,7 @@ void Scripting::loadContextMenu() {
QStringList scripts;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "ksysguard/scripts/", QStandardPaths::LocateDirectory);
Q_FOREACH (const QString& dir, dirs) {
- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
scripts.append(it.next());
}
--
2.5.2

21
pkgs/desktops/plasma-5.4/libksysguard/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ plasmaPackage, extra-cmake-modules, kauth, kcompletion
, kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons
, kwindowsystem, plasma-framework, qtscript, qtwebkit, qtx11extras
, kconfig, ki18n, kiconthemes
}:
plasmaPackage {
name = "libksysguard";
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
kcompletion kconfigwidgets kcoreaddons kservice
kwidgetsaddons qtscript qtwebkit
];
propagatedBuildInputs = [
kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework
qtx11extras
];
}

23
pkgs/desktops/plasma-5.4/milou.nix
View File

@ -1,12 +1,5 @@
{ plasmaPackage
, extra-cmake-modules
, qtscript
, qtdeclarative
, kcoreaddons
, ki18n
, kdeclarative
, kservice
, plasma-framework
{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative
, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
, krunner
}:
@ -16,13 +9,9 @@ plasmaPackage {
extra-cmake-modules
];
buildInputs = [
qtscript
qtdeclarative
kcoreaddons
ki18n
kdeclarative
kservice
plasma-framework
krunner
qtscript kcoreaddons kservice
];
propagatedBuildInputs = [
kdeclarative ki18n krunner plasma-framework qtdeclarative
];
}

36
pkgs/desktops/plasma-5.4/oxygen.nix
View File

@ -1,38 +1,20 @@
{ plasmaPackage
, extra-cmake-modules
, ki18n
, kcmutils
, kconfig
, kdecoration
, kguiaddons
, kwidgetsaddons
, kservice
, kcompletion
, frameworkintegration
, kwindowsystem
, qtx11extras
{ plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig
, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion
, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras
}:
plasmaPackage {
name = "oxygen";
nativeBuildInputs = [
extra-cmake-modules
extra-cmake-modules makeQtWrapper
];
buildInputs = [
ki18n
kcmutils
kconfig
kdecoration
kguiaddons
kwidgetsaddons
kservice
kcompletion
frameworkintegration
kwindowsystem
qtx11extras
kcmutils kconfig kdecoration kguiaddons kwidgetsaddons
kservice kcompletion
];
propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
postInstall = ''
wrapKDEProgram "$out/bin/oxygen-demo5"
wrapKDEProgram "$out/bin/oxygen-settings5"
wrapQtProgram "$out/bin/oxygen-demo5"
wrapQtProgram "$out/bin/oxygen-settings5"
'';
}

6
pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch
View File

@ -1,7 +1,7 @@
From bce620c9dcb25a4e603b22ead5c004b053dae7bf Mon Sep 17 00:00:00 2001
From 618d86f35b83ee9e57da12be9d0866e34e487b88 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 28 Aug 2015 10:16:38 -0500
Subject: [PATCH 1/2] hwclock
Subject: [PATCH 1/3] hwclock
---
kcms/dateandtime/helper.cpp | 6 +-----
@ -32,5 +32,5 @@ index cec5ab8..fc4a6b9 100644
KProcess::execute(hwclock, QStringList() << "--systohc");
}
--
2.5.0
2.5.2

6
pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch
View File

@ -1,7 +1,7 @@
From 2778186be31a8f949135ed99232eafee201a668d Mon Sep 17 00:00:00 2001
From decdc77a7e89b6f1bb3d49268b08a43daf4a7147 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 28 Aug 2015 10:16:53 -0500
Subject: [PATCH 2/2] zoneinfo
Subject: [PATCH 2/3] zoneinfo
---
kcms/dateandtime/helper.cpp | 7 ++++++-
@ -26,5 +26,5 @@ index fc4a6b9..7b64d05 100644
if (QFile::exists(tz)) { // make sure the new TZ really exists
QFile::remove("/etc/localtime");
--
2.5.0
2.5.2

67
pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch Normal file
View File

@ -0,0 +1,67 @@
From 4231d70ec08d9bbb367b222d9ef04454c1dc7328 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 19 Oct 2015 18:45:36 -0500
Subject: [PATCH 3/3] qt-5.5 QML import paths
---
applets/pager/package/contents/ui/main.qml | 2 +-
containments/desktop/package/contents/ui/FolderView.qml | 2 +-
containments/desktop/package/contents/ui/main.qml | 2 +-
containments/panel/contents/ui/main.qml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml
index 0c367c6..c9a82be 100644
--- a/applets/pager/package/contents/ui/main.qml
+++ b/applets/pager/package/contents/ui/main.qml
@@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents
import org.kde.draganddrop 2.0
import org.kde.plasma.private.pager 2.0
-import "utils.js" as Utils
+import "../code/utils.js" as Utils
MouseArea {
id: root
diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
index 578ec87..04e088c 100644
--- a/containments/desktop/package/contents/ui/FolderView.qml
+++ b/containments/desktop/package/contents/ui/FolderView.qml
@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.kquickcontrolsaddons 2.0
import org.kde.private.desktopcontainment.folder 0.1 as Folder
-import "FolderTools.js" as FolderTools
+import "../code/FolderTools.js" as FolderTools
Item {
id: main
diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml
index 8c42706..fc74433 100644
--- a/containments/desktop/package/contents/ui/main.qml
+++ b/containments/desktop/package/contents/ui/main.qml
@@ -28,7 +28,7 @@ import org.kde.draganddrop 2.0 as DragDrop
import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
-import "LayoutManager.js" as LayoutManager
+import "../code/LayoutManager.js" as LayoutManager
DragDrop.DropArea {
id: root
diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
index 6a6f364..edba48e 100644
--- a/containments/panel/contents/ui/main.qml
+++ b/containments/panel/contents/ui/main.qml
@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0
import org.kde.draganddrop 2.0 as DragDrop
-import "LayoutManager.js" as LayoutManager
+import "../code/LayoutManager.js" as LayoutManager
DragDrop.DropArea {
id: root
--
2.5.2

124
pkgs/desktops/plasma-5.4/plasma-desktop/default.nix
View File

@ -1,99 +1,45 @@
{ plasmaPackage
, substituteAll
, extra-cmake-modules
, kdoctools
, attica
, baloo
, boost
, fontconfig
, kactivities
, kauth
, kcmutils
, kdbusaddons
, kdeclarative
, kded
, kdelibs4support
, kemoticons
, kglobalaccel
, ki18n
, kitemmodels
, knewstuff
, knotifications
, knotifyconfig
, kpeople
, krunner
, kwallet
, kwin
, phonon
, plasma-framework
, plasma-workspace
, qtdeclarative
, qtx11extras
, qtsvg
, libXcursor
, libXft
, libxkbfile
, xf86inputevdev
, xf86inputsynaptics
, xinput
, xkeyboard_config
, xorgserver
, libcanberra_kde
, libpulseaudio
, utillinux
{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
, attica, baloo, boost, fontconfig, kactivities, kauth, kcmutils
, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons
, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications
, knotifyconfig, kpeople, krunner, kwallet, kwin, phonon
, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux
, qtquick1, qtquickcontrols
}:
plasmaPackage {
plasmaPackage rec {
name = "plasma-desktop";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
attica
baloo
boost
fontconfig
kactivities
kauth
kcmutils
kdbusaddons
kdeclarative
kded
kdelibs4support
kemoticons
kglobalaccel
ki18n
kitemmodels
knewstuff
knotifications
knotifyconfig
kpeople
krunner
kwallet
kwin
libcanberra_kde
libXcursor
libpulseaudio
libXft
libxkbfile
phonon
plasma-framework
plasma-workspace
qtdeclarative
qtx11extras
qtsvg
xf86inputevdev
xf86inputsynaptics
xkeyboard_config
xinput
attica boost fontconfig kcmutils kdbusaddons kded kitemmodels
knewstuff knotifications knotifyconfig kwallet libcanberra_kde
libXcursor libpulseaudio libXft libxkbfile phonon
qtsvg xf86inputevdev xf86inputsynaptics
xkeyboard_config xinput
];
propagatedBuildInputs = [
baloo kactivities kauth kdeclarative kdelibs4support kemoticons
kglobalaccel ki18n kpeople krunner kwin plasma-framework
plasma-workspace qtdeclarative qtquick1 qtquickcontrols
qtx11extras
];
# All propagatedBuildInputs should be present in the profile because
# wrappers cannot be used here.
propagatedUserEnvPkgs = propagatedBuildInputs;
patches = [
(substituteAll {
src = ./0001-hwclock.patch;
hwclock = "${utillinux}/sbin/hwclock";
})
./0002-zoneinfo.patch
./0003-qt-5.5-QML-import-paths.patch
];
NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ];
cmakeFlags = [
@ -101,13 +47,13 @@ plasmaPackage {
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"
];
postInstall = ''
wrapKDEProgram "$out/bin/kaccess"
wrapKDEProgram "$out/bin/solid-action-desktop-gen"
wrapKDEProgram "$out/bin/knetattach"
wrapKDEProgram "$out/bin/krdb"
wrapKDEProgram "$out/bin/kapplymousetheme"
wrapKDEProgram "$out/bin/kfontinst"
wrapKDEProgram "$out/bin/kcm-touchpad-list-devices"
wrapKDEProgram "$out/bin/kfontview"
wrapQtProgram "$out/bin/kaccess"
wrapQtProgram "$out/bin/solid-action-desktop-gen"
wrapQtProgram "$out/bin/knetattach"
wrapQtProgram "$out/bin/krdb"
wrapQtProgram "$out/bin/kapplymousetheme"
wrapQtProgram "$out/bin/kfontinst"
wrapQtProgram "$out/bin/kcm-touchpad-list-devices"
wrapQtProgram "$out/bin/kfontview"
'';
}

43
pkgs/desktops/plasma-5.4/plasma-mediacenter.nix
View File

@ -1,40 +1,23 @@
{ plasmaPackage
, extra-cmake-modules
, baloo
, kactivities
, kconfig
, kcoreaddons
, kdeclarative
, kguiaddons
, ki18n
, kio
, kservice
, kfilemetadata
, plasma-framework
, qtdeclarative
, qtmultimedia
{ plasmaPackage, extra-cmake-modules, baloo, kactivities, kconfig
, kcoreaddons, kdeclarative, kguiaddons, ki18n, kio, kservice
, kfilemetadata, plasma-framework, qtdeclarative, qtmultimedia
, taglib
}:
plasmaPackage {
plasmaPackage rec {
name = "plasma-mediacenter";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
baloo
kactivities
kconfig
kcoreaddons
kdeclarative
kguiaddons
ki18n
kio
kservice
kfilemetadata
plasma-framework
qtdeclarative
qtmultimedia
taglib
kconfig kcoreaddons kguiaddons kservice
qtdeclarative qtmultimedia taglib
];
propagatedBuildInputs = [
baloo kactivities kdeclarative kfilemetadata ki18n kio
plasma-framework
];
# All propagatedBuildInputs should be present in the profile because
# wrappers cannot be used here.
propagatedUserEnvPkgs = propagatedBuildInputs;
}

65
pkgs/desktops/plasma-5.4/plasma-nm.nix
View File

@ -1,65 +0,0 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, kcompletion
, kconfigwidgets
, kcoreaddons
, kdbusaddons
, kdeclarative
, kdelibs4support
, ki18n
, kiconthemes
, kinit
, kio
, kitemviews
, knotifications
, kservice
, kwallet
, kwidgetsaddons
, kwindowsystem
, kxmlgui
, mobile_broadband_provider_info
, modemmanager-qt
, networkmanager-qt
, openconnect
, plasma-framework
, qtdeclarative
, solid
}:
plasmaPackage {
name = "plasma-nm";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
kcompletion
kconfigwidgets
kcoreaddons
kdbusaddons
kdeclarative
kdelibs4support
ki18n
kiconthemes
kinit
kio
kitemviews
knotifications
kservice
kwallet
kwidgetsaddons
kwindowsystem
kxmlgui
mobile_broadband_provider_info
modemmanager-qt
networkmanager-qt
openconnect
plasma-framework
qtdeclarative
solid
];
postInstall = ''
wrapKDEProgram "$out/bin/kde5-nm-connection-editor"
'';
}

25
pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch Normal file
View File

@ -0,0 +1,25 @@
From faf13c97ff1192a201843b9d52f4002dbd9022af Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 25 Oct 2015 09:09:27 -0500
Subject: [PATCH] mobile-broadband-provider-info path
---
libs/editor/mobileproviders.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/editor/mobileproviders.cpp b/libs/editor/mobileproviders.cpp
index 568cb34..98a5992 100644
--- a/libs/editor/mobileproviders.cpp
+++ b/libs/editor/mobileproviders.cpp
@@ -26,7 +26,7 @@
#include <KLocale>
-const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml";
+const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml";
bool localeAwareCompare(const QString & one, const QString & two) {
return one.localeAwareCompare(two) < 0;
--
2.6.2

36
pkgs/desktops/plasma-5.4/plasma-nm/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
, kxmlgui, makeQtWrapper, mobile_broadband_provider_info
, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
, qtdeclarative, solid
}:
plasmaPackage {
name = "plasma-nm";
patches = [
(substituteAll {
src = ./0001-mobile-broadband-provider-info-path.patch;
inherit mobile_broadband_provider_info;
})
];
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
kinit kitemviews knotifications kservice kwallet kwidgetsaddons
kxmlgui mobile_broadband_provider_info modemmanager-qt
networkmanager-qt openconnect solid
];
propagatedBuildInputs = [
kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
qtdeclarative
];
postInstall = ''
wrapQtProgram "$out/bin/kde5-nm-connection-editor"
'';
}

23
pkgs/desktops/plasma-5.4/plasma-pa.nix
View File

@ -1,12 +1,5 @@
{ plasmaPackage
, extra-cmake-modules
, glib
, kconfigwidgets
, kcoreaddons
, kdeclarative
, kglobalaccel
, ki18n
, libpulseaudio
{ plasmaPackage, extra-cmake-modules, glib, kconfigwidgets
, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio
, plasma-framework
}:
@ -16,13 +9,9 @@ plasmaPackage {
extra-cmake-modules
];
buildInputs = [
glib
kconfigwidgets
kcoreaddons
kdeclarative
kglobalaccel
ki18n
libpulseaudio
plasma-framework
glib kconfigwidgets kcoreaddons libpulseaudio
];
propagatedBuildInputs = [
kdeclarative kglobalaccel ki18n plasma-framework
];
}

19
pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch
View File

@ -1,14 +1,14 @@
From d34575dc1edb9fcc8e7608e82e63c6c9d20f37ea Mon Sep 17 00:00:00 2001
From 35efc2ce92ed698abb21a79aa6e6670e844ea776 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 27 Aug 2015 20:36:39 -0500
Subject: [PATCH] startkde NixOS patches
Subject: [PATCH 1/2] startkde NixOS patches
---
startkde/startkde.cmake | 219 ++++++++++++++++++++----------------------------
1 file changed, 89 insertions(+), 130 deletions(-)
startkde/startkde.cmake | 217 ++++++++++++++++++++----------------------------
1 file changed, 88 insertions(+), 129 deletions(-)
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index cfbe227..999dd8f 100644
index 2c4c315..7733721 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -1,8 +1,31 @@
@ -94,7 +94,7 @@ index cfbe227..999dd8f 100644
#This is basically setting defaults so we can use them with kstartupconfig5
cat >$configDir/startupconfigkeys <<EOF
@@ -101,55 +106,21 @@ XftSubPixel=none
@@ -101,53 +106,19 @@ XftSubPixel=none
EOF
}
@ -150,11 +150,8 @@ index cfbe227..999dd8f 100644
if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
- @EXPORT_XCURSOR_PATH@
- kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+ @out@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
if test $? -eq 10; then
XCURSOR_THEME=breeze_cursors
export XCURSOR_THEME
@@ -163,21 +134,39 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
fi
fi
@ -400,5 +397,5 @@ index cfbe227..999dd8f 100644
echo 'startkde: Done.' 1>&2
--
2.5.0
2.6.2

123
pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch Normal file
View File

@ -0,0 +1,123 @@
From 033d3560d26ceabbd6da6310d326fec7a473df82 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 19 Oct 2015 18:55:36 -0500
Subject: [PATCH 2/2] qt-5.5 QML import paths
---
applets/analog-clock/contents/ui/analogclock.qml | 2 +-
applets/batterymonitor/package/contents/ui/BatteryItem.qml | 2 +-
applets/batterymonitor/package/contents/ui/CompactRepresentation.qml | 2 +-
applets/batterymonitor/package/contents/ui/PopupDialog.qml | 2 +-
applets/batterymonitor/package/contents/ui/batterymonitor.qml | 2 +-
applets/lock_logout/contents/ui/lockout.qml | 2 +-
applets/notifications/package/contents/ui/main.qml | 2 +-
applets/systemtray/package/contents/ui/main.qml | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/applets/analog-clock/contents/ui/analogclock.qml b/applets/analog-clock/contents/ui/analogclock.qml
index edb3af9..7eb839d 100644
--- a/applets/analog-clock/contents/ui/analogclock.qml
+++ b/applets/analog-clock/contents/ui/analogclock.qml
@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as PlasmaCalendar
import QtQuick.Layouts 1.1
import org.kde.plasma.core 2.0 as PlasmaCore
-import "logic.js" as Logic
+import "../code/logic.js" as Logic
Item {
id: analogclock
diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
index 8d43797..3322369 100644
--- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.plasma.workspace.components 2.0
import org.kde.kcoreaddons 1.0 as KCoreAddons
-import "logic.js" as Logic
+import "../code/logic.js" as Logic
Item {
id: batteryItem
diff --git a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
index b4059cb..ae8eeaf 100755
--- a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+++ b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as Components
import org.kde.plasma.workspace.components 2.0
-import "logic.js" as Logic
+import "../code/logic.js" as Logic
MouseArea {
id: root
diff --git a/applets/batterymonitor/package/contents/ui/PopupDialog.qml b/applets/batterymonitor/package/contents/ui/PopupDialog.qml
index d4952c6..2b6586d 100644
--- a/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+++ b/applets/batterymonitor/package/contents/ui/PopupDialog.qml
@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as Components
import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.kquickcontrolsaddons 2.0
-import "logic.js" as Logic
+import "../code/logic.js" as Logic
FocusScope {
id: dialog
diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
index a086581..6e1e8be 100755
--- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.kcoreaddons 1.0 as KCoreAddons
import org.kde.kquickcontrolsaddons 2.0
-import "logic.js" as Logic
+import "../code/logic.js" as Logic
Item {
id: batterymonitor
diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml
index d243796..86475df 100644
--- a/applets/lock_logout/contents/ui/lockout.qml
+++ b/applets/lock_logout/contents/ui/lockout.qml
@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0
import org.kde.kquickcontrolsaddons 2.0
-import "data.js" as Data
+import "../code/data.js" as Data
Flow {
id: lockout
diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml
index 2871cdb..3f50856 100644
--- a/applets/notifications/package/contents/ui/main.qml
+++ b/applets/notifications/package/contents/ui/main.qml
@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.plasma.private.notifications 1.0
-import "uiproperties.js" as UiProperties
+import "../code/uiproperties.js" as UiProperties
MouseEventListener {
id: notificationsApplet
diff --git a/applets/systemtray/package/contents/ui/main.qml b/applets/systemtray/package/contents/ui/main.qml
index 2e26455..864c9c5 100644
--- a/applets/systemtray/package/contents/ui/main.qml
+++ b/applets/systemtray/package/contents/ui/main.qml
@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
// import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.private.systemtray 2.0 as SystemTray
-import "Layout.js" as LayoutManager
+import "../code/Layout.js" as LayoutManager
Item {
id: root
--
2.6.2

142
pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
View File

@ -1,103 +1,37 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, baloo
, kactivities
, kcmutils
, kcrash
, kdbusaddons
, kdeclarative
, kdelibs4support
, kdesu
, kdewebkit
, kglobalaccel
, kidletime
, kjsembed
, knewstuff
, knotifyconfig
, kpackage
, krunner
, ktexteditor
, ktextwidgets
, kwallet
, kwayland
, kwin
, kxmlrpcclient
, libdbusmenu
, libkscreen
, libSM
, libXcursor
, networkmanager-qt
, pam
, phonon
, plasma-framework
, qtscript
, qtx11extras
, wayland
, libksysguard
, bash
, coreutils
, gnused
, gnugrep
, socat
, kconfig
, kinit
, kservice
, qttools
, dbus_tools
, mkfontdir
, xmessage
, xprop
, xrdb
, xset
, xsetroot
{ plasmaPackage, extra-cmake-modules, kdoctools, baloo
, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative
, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime
, kjsembed, knewstuff, knotifyconfig, kpackage, krunner
, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient
, libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt
, pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland
, libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig
, kinit, kservice, makeQtWrapper, qttools, dbus_tools, mkfontdir, xmessage
, xprop, xrdb, xset, xsetroot, solid, qtquickcontrols
}:
plasmaPackage {
plasmaPackage rec {
name = "plasma-workspace";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
baloo
kactivities
kcmutils
kcrash
kdbusaddons
kdeclarative
kdelibs4support
kdesu
kdewebkit
kglobalaccel
kidletime
kjsembed
knewstuff
knotifyconfig
kpackage
krunner
ktexteditor
ktextwidgets
kwallet
kwayland
kwin
kxmlrpcclient
libdbusmenu
libkscreen
libSM
libXcursor
networkmanager-qt
pam
phonon
plasma-framework
qtscript
qtx11extras
wayland
kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff
knotifyconfig kpackage ktextwidgets kwallet kwayland kxmlrpcclient
libdbusmenu libSM libXcursor networkmanager-qt pam phonon
qtscript wayland
];
propagatedBuildInputs = [
libksysguard
baloo kactivities kdeclarative kdelibs4support kglobalaccel
kidletime krunner ktexteditor kwin libkscreen libksysguard
plasma-framework qtquick1 qtquickcontrols qtx11extras solid
];
patches = [
./0001-startkde-NixOS-patches.patch
./0002-qt-5.5-QML-import-paths.patch
];
patches = [ ./0001-startkde-NixOS-patches.patch ];
inherit bash coreutils gnused gnugrep socat;
inherit kconfig kinit kservice qttools;
@ -108,18 +42,22 @@ plasmaPackage {
--replace kdostartupconfig5 $out/bin/kdostartupconfig5
'';
postInstall = ''
wrapKDEProgram "$out/bin/ksmserver"
wrapKDEProgram "$out/bin/plasmawindowed"
wrapKDEProgram "$out/bin/kcminit_startup"
wrapKDEProgram "$out/bin/ksplashqml"
wrapKDEProgram "$out/bin/kcheckrunning"
wrapKDEProgram "$out/bin/systemmonitor"
wrapKDEProgram "$out/bin/kstartupconfig5"
wrapKDEProgram "$out/bin/startplasmacompositor"
wrapKDEProgram "$out/bin/kdostartupconfig5"
wrapKDEProgram "$out/bin/klipper"
wrapKDEProgram "$out/bin/kuiserver5"
wrapKDEProgram "$out/bin/krunner"
wrapKDEProgram "$out/bin/plasmashell"
wrapQtProgram "$out/bin/ksmserver"
wrapQtProgram "$out/bin/plasmawindowed"
wrapQtProgram "$out/bin/kcminit_startup"
wrapQtProgram "$out/bin/ksplashqml"
wrapQtProgram "$out/bin/kcheckrunning"
wrapQtProgram "$out/bin/systemmonitor"
wrapQtProgram "$out/bin/kstartupconfig5"
wrapQtProgram "$out/bin/startplasmacompositor"
wrapQtProgram "$out/bin/kdostartupconfig5"
wrapQtProgram "$out/bin/klipper"
wrapQtProgram "$out/bin/kuiserver5"
wrapQtProgram "$out/bin/krunner"
wrapQtProgram "$out/bin/plasmashell"
wrapQtProgram "$out/lib/libexec/drkonqi"
wrapQtProgram "$out/lib/libexec/kscreenlocker_greet"
rm "$out/lib/libexec/startplasma"
'';
}

3
pkgs/desktops/plasma-5.4/polkit-kde-agent.nix
View File

@ -18,8 +18,6 @@ plasmaPackage {
extra-cmake-modules
];
buildInputs = [
ki18n
kwindowsystem
kdbusaddons
kwidgetsaddons
kcoreaddons
@ -29,4 +27,5 @@ plasmaPackage {
knotifications
polkitQt
];
propagatedBuildInputs = [ ki18n kwindowsystem ];
}

42
pkgs/desktops/plasma-5.4/powerdevil.nix
View File

@ -1,21 +1,7 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, kactivities
, kauth
, kconfig
, kdbusaddons
, kdelibs4support
, kglobalaccel
, ki18n
, kidletime
, kio
, knotifyconfig
, libkscreen
, plasma-workspace
, qtx11extras
, solid
, udev
{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities
, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
, kidletime, kio, knotifyconfig, libkscreen, plasma-workspace
, qtx11extras, solid, udev
}:
plasmaPackage {
@ -25,20 +11,10 @@ plasmaPackage {
kdoctools
];
buildInputs = [
kactivities
kauth
kconfig
kdbusaddons
kdelibs4support
kglobalaccel
ki18n
kidletime
kio
knotifyconfig
libkscreen
plasma-workspace
qtx11extras
solid
udev
kconfig kdbusaddons knotifyconfig solid udev
];
propagatedBuildInputs = [
kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime
libkscreen plasma-workspace qtx11extras
];
}

32
pkgs/desktops/plasma-5.4/systemsettings.nix
View File

@ -1,17 +1,6 @@
{ plasmaPackage
, extra-cmake-modules
, kdoctools
, kitemviews
, kcmutils
, ki18n
, kio
, kservice
, kiconthemes
, kwindowsystem
, kxmlgui
, kdbusaddons
, kconfig
, khtml
{ plasmaPackage, extra-cmake-modules, kdoctools, kitemviews
, kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem
, kxmlgui, kdbusaddons, kconfig, khtml, makeQtWrapper
}:
plasmaPackage {
@ -19,21 +8,14 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
kitemviews
kcmutils
ki18n
kio
kservice
kiconthemes
kwindowsystem
kxmlgui
kdbusaddons
kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons
kconfig
khtml
];
propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ];
postInstall = ''
wrapKDEProgram "$out/bin/systemsettings5"
wrapQtProgram "$out/bin/systemsettings5"
'';
}

217
pkgs/development/libraries/kde-frameworks-5.10/default.nix
View File

@ -1,217 +0,0 @@
# Maintainer's Notes:
#
# Minor updates:
# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
# releases updates that include only the changed packages; in this case,
# multiple URLs can be provided and the results will be merged.
# 2. Run ./manifest.sh and ./dependencies.sh.
# 3. Build and enjoy.
#
# Major updates:
# We prefer not to immediately overwrite older versions with major updates, so
# make a copy of this directory first. After copying, be sure to delete ./tmp
# if it exists. Then follow the minor update instructions.
{ pkgs, newScope, qt5 ? null, debug ? false }:
let inherit (pkgs) autonix stdenv symlinkJoin; in
with autonix; let inherit (stdenv) lib; in
let
qt5_ = if qt5 != null then qt5 else pkgs.qt54;
in
let
qt5 = qt5_;
super =
let json = builtins.fromJSON (builtins.readFile ./packages.json);
mirrorUrl = n: pkg: pkg // {
src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
};
renames = builtins.fromJSON (builtins.readFile ./renames.json);
propagated = [ "extra-cmake-modules" ];
native = [
"bison"
"extra-cmake-modules"
"flex"
"kdoctools"
"ki18n"
"libxslt"
"perl"
"pythoninterp"
];
user = [
"qt5"
"qt5core"
"qt5dbus"
"qt5gui"
"qt5qml"
"qt5quick"
"qt5svg"
"qt5webkitwidgets"
"qt5widgets"
"qt5x11extras"
"shareddesktopontologies"
"sharedmimeinfo"
];
in lib.fold (f: attrs: f attrs) json [
(lib.mapAttrs kdePackage)
(userEnvDeps user)
(nativeDeps native)
(propagateDeps propagated)
(renameDeps renames)
(lib.mapAttrs mirrorUrl)
];
kdePackage = name: pkg:
let defaultOverride = drv: drv // {
setupHook = ./setup-hook.sh;
cmakeFlags =
(drv.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
meta = {
license = with stdenv.lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
};
};
callPackage = newScope {
inherit (stdenv) mkDerivation;
inherit (pkgs) fetchurl;
inherit scope;
};
in mkPackage callPackage defaultOverride name pkg;
scope =
# packages in this collection
self //
# packages pinned to this version of Qt 5
{
dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; };
qt5 = qt5.base;
qt5core = qt5.base;
qt5dbus = qt5.base;
qt5gui = qt5.base;
qt5linguisttools = qt5.tools;
qt5qml = [qt5.declarative qt5.graphicaleffects];
qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
qt5script = qt5.script;
qt5svg = qt5.svg;
qt5webkitwidgets = qt5.webkit;
qt5widgets = qt5.base;
qt5x11extras = qt5.x11extras;
qt5xmlpatterns = qt5.xmlpatterns;
} //
# packages from the nixpkgs collection
(with pkgs;
{
inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
libgcrypt libgit2 modemmanager networkmanager perl
perlPackages qimageblitz xorg zlib;
boost = boost155;
gif = giflib;
glib2 = glib;
jpeg = libjpeg;
libintl = gettext;
liblzma = lzma;
pythoninterp = python;
pythonlibrary = python;
sharedmimeinfo = shared_mime_info;
}
);
self = super // {
extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: {
buildInputs = [];
nativeBuildInputs = [];
propagatedBuildInputs = [];
propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
propagatedUserEnvPkgs = [];
cmakeFlags = ["-DBUILD_TESTING=OFF"];
patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch];
meta = {
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
};
});
frameworkintegration = extendDerivation super.frameworkintegration {
buildInputs = [ scope.xorg.libXcursor ];
};
kauth = extendDerivation super.kauth {
buildInputs = [ scope.polkit_qt5 ];
patches = [ ./kauth/kauth-policy-install.patch ];
};
kcmutils = extendDerivation super.kcmutils {
patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ];
};
kconfigwidgets = extendDerivation super.kconfigwidgets {
patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ];
};
kdelibs4support = extendDerivation super.kdelibs4support {
buildInputs = [ scope.networkmanager scope.xorg.libSM ];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5"
];
};
kdoctools = extendDerivation super.kdoctools {
propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5"
"-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook"
];
patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ];
};
ki18n = extendDerivation super.ki18n {
propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ];
};
kimageformats = extendDerivation super.kimageformats {
NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR";
};
kinit = extendDerivation super.kinit {
patches = [./kinit/0001-kinit-libpath.patch];
};
kpackage = extendDerivation super.kpackage {
patches = [ ./kpackage/0001-allow-external-paths.patch ];
};
kservice = extendDerivation super.kservice {
buildInputs = [ scope.kwindowsystem ];
patches = [
./kservice/kservice-kbuildsycoca-follow-symlinks.patch
./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
];
};
ktexteditor = extendDerivation super.ktexteditor {
patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
};
networkmanager-qt = extendDerivation super.networkmanager-qt {
propagatedBuildInputs = [ scope.networkmanager ];
};
};
in self

22
pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh
View File

@ -1,22 +0,0 @@
#!/bin/sh
# This script rebuilds dependencies.nix.
# You must run manifest.sh first to download the packages.
# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
# If you are working on the packages, this is probably what you want.
# You can also pass the path to a source tree where you have built
# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
# probably what you want.
manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
autonixDepsKf5=""
if [[ -z $1 ]]; then
autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin
else
autonixDepsKF5="$1/dist/build/kf5-deps"
fi
exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"

13
pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
index c63241b..2243f94 100644
--- a/src/kpluginselector.cpp
+++ b/src/kpluginselector.cpp
@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
QStringList desktopFileNames;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &dir, dirs) {
- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
desktopFileNames.append(it.next());
}

13
pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
index 53a331e..80fbb01 100644
--- a/src/khelpclient.cpp
+++ b/src/khelpclient.cpp
@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
QString docPath;
const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
Q_FOREACH (const QString &dir, desktopDirs) {
- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
const QString desktopPath(it.next());
KDesktopFile desktopFile(desktopPath);

25
pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch
View File

@ -1,25 +0,0 @@
From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 28 Jan 2015 07:15:30 -0600
Subject: [PATCH] allow external paths
---
src/kpackage/package.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
index eb4a09b..f70f1a1 100644
--- a/src/kpackage/package.cpp
+++ b/src/kpackage/package.cpp
@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate()
: QSharedData(),
fallbackPackage(0),
metadata(0),
- externalPaths(false),
+ externalPaths(true),
valid(false),
checkedValid(false)
{
--
2.1.4

13
pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
index 69b1427..9c37a49 100644
--- a/src/kbuildsycoca/kbuildsycoca.cpp
+++ b/src/kbuildsycoca/kbuildsycoca.cpp
@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
QStringList relFiles;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &dir, dirs) {
- QDirIterator it(dir, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
const QString filePath = it.next();
Q_ASSERT(filePath.startsWith(dir)); // due to the line below...

13
pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
index 2eb1275..e39a36f 100644
--- a/src/kbuildsycoca/vfolder_menu.cpp
+++ b/src/kbuildsycoca/vfolder_menu.cpp
@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
}
if (!relative) {
- QString resolved = QDir(dir).canonicalPath();
+ QString resolved = QDir::cleanPath(dir);
if (!resolved.isEmpty()) {
dir = resolved;
}

48
pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch
View File

@ -1,48 +0,0 @@
From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 15 Feb 2015 19:09:17 -0600
Subject: [PATCH] no qcoreapplication
---
src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
index 3f02e8c..d1a865b 100644
--- a/src/syntax/data/katehighlightingindexer.cpp
+++ b/src/syntax/data/katehighlightingindexer.cpp
@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName)
int main(int argc, char *argv[])
{
- // get app instance
- QCoreApplication app(argc, argv);
-
// ensure enough arguments are passed
- if (app.arguments().size() < 3)
+ if (argc < 3)
return 1;
// open schema
QXmlSchema schema;
- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
return 2;
- const QString hlFilenamesListing = app.arguments().value(3);
+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
if (hlFilenamesListing.isEmpty()) {
return 1;
}
@@ -127,7 +124,7 @@ int main(int argc, char *argv[])
return anyError;
// create outfile, after all has worked!
- QFile outFile(app.arguments().at(1));
+ QFile outFile(QString::fromLocal8Bit(argv[1]));
if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
return 7;
--
2.1.4

2090
pkgs/development/libraries/kde-frameworks-5.10/packages.json
View File

File diff suppressed because it is too large Load Diff

22
pkgs/development/libraries/kde-frameworks-5.10/packages.sh
View File

@ -1,22 +0,0 @@
#!/bin/sh
set -x
origin="$(pwd)"
# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
alias nix-build="nix-build --no-out-link \"$origin/../../../..\""
# The extra slash at the end of the URL is necessary to stop wget
# from recursing over the whole server! (No, it's not a bug.)
$(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/frameworks/5.10/" \
"$@" -A '*.tar.xz'
AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
$AUTONIX_DEPS_KF5 manifest.json
rm manifest.json

13
pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
index 07b3c90..84417e3 100644
--- a/src/plasma/package.cpp
+++ b/src/plasma/package.cpp
@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
servicePrefix("plasma-applet-"),
fallbackPackage(0),
metadata(0),
- externalPaths(false),
+ externalPaths(true),
valid(false),
checkedValid(false)
{

70
pkgs/development/libraries/kde-frameworks-5.10/renames.json
View File

@ -1,70 +0,0 @@
{
"kf5widgetsaddons": "kwidgetsaddons",
"kf5texteditor": "ktexteditor",
"kf5designerplugin": "kdesignerplugin",
"kf5bookmarks": "kbookmarks",
"kf5frameworkintegration": "frameworkintegration",
"kf5package": "kpackage",
"kf5archive": "karchive",
"kf5plasma": "plasma-framework",
"kf5kcmutils": "kcmutils",
"kf5configwidgets": "kconfigwidgets",
"ctest": "attica",
"kf5kio": "kio",
"kf5networkmanagerqt": "networkmanager-qt",
"kf5coreaddons": "kcoreaddons",
"kf5guiaddons": "kguiaddons",
"kf5jobwidgets": "kjobwidgets",
"kf5modemmanagerqt": "modemmanager-qt",
"kf5runner": "krunner",
"kf5globalaccel": "kglobalaccel",
"kf5dbusaddons": "kdbusaddons",
"kf5crash": "kcrash",
"kf5itemviews": "kitemviews",
"kf5doctools": "kdoctools",
"kf5i18n": "ki18n",
"kf5webkit": "kdewebkit",
"kf5newstuff": "knewstuff",
"kded": "kded",
"kf5notifications": "knotifications",
"kf5activitiesexperimentalstats": "kactivities",
"kf5dnssd": "kdnssd",
"kf5notifyconfig": "knotifyconfig",
"kf5iconthemes": "kiconthemes",
"kf5js": "kjs",
"kf5kde4support": "kdelibs4support",
"kf5parts": "kparts",
"backend": "plasma-framework",
"kf5completion": "kcompletion",
"kf5threadweaver": "threadweaver",
"kf5mediaplayer": "kmediaplayer",
"kf5plasmaquick": "plasma-framework",
"kf5wallet": "kwallet",
"kf5xmlgui": "kxmlgui",
"kf5attica": "attica",
"kf5declarative": "kdeclarative",
"kf5config": "kconfig",
"kf5init": "kinit",
"kf5textwidgets": "ktextwidgets",
"kf5jsembed": "kjsembed",
"kf5codecs": "kcodecs",
"kf5service": "kservice",
"kf5sonnet": "sonnet",
"kf5kdelibs4support": "kdelibs4support",
"kf5pty": "kpty",
"kf5solid": "solid",
"kf5auth": "kauth",
"ecm": "extra-cmake-modules",
"kf5activities": "kactivities",
"kf5plotting": "kplotting",
"kf5people": "kpeople",
"kf5emoticons": "kemoticons",
"kf5kross": "kross",
"kf5su": "kdesu",
"kf5khtml": "khtml",
"kf5unitconversion": "kunitconversion",
"kf5idletime": "kidletime",
"kf5windowsystem": "kwindowsystem",
"kf5xmlrpcclient": "kxmlrpcclient",
"kf5itemmodels": "kitemmodels"
}

Some files were not shown because too many files have changed in this diff Show More