swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kde-frameworks-5.16'

Browse source
This commit is contained in:
Thomas Tuegel 2015-11-23 08:47:18 -06:00
parent ec980c7b1e f8206f6857
commit d0589b0c54
166 changed files with 7461 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/x11/desktop-managers/kde5.nix
View file

@ -108,7 +108,7 @@ in
kdeApps.okular
kdeApps.print-manager
kdeApps.oxygen-icons
(plasma5.oxygen-icons or kf5.oxygen-icons5)
pkgs.hicolor_icon_theme
plasma5.kde-gtk-config
@ -155,7 +155,7 @@ in
GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
};
fonts.fonts = [ plasma5.oxygen-fonts ];
fonts.fonts = [ (plasma5.oxygen-fonts or pkgs.noto-fonts) ];
programs.ssh.askPassword = "${plasma5.ksshaskpass}/bin/ksshaskpass";

1
nixos/release.nix
View file

@ -285,6 +285,7 @@ in rec {
tests.proxy = callTest tests/proxy.nix {};
tests.quake3 = callTest tests/quake3.nix {};
tests.runInMachine = callTest tests/run-in-machine.nix {};
tests.sddm = callTest tests/sddm.nix {};
tests.simple = callTest tests/simple.nix {};
tests.tomcat = callTest tests/tomcat.nix {};
tests.udisks2 = callTest tests/udisks2.nix {};

28
nixos/tests/sddm.nix Normal file
View file

@ -0,0 +1,28 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "sddm";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ttuegel ];
};
machine = { lib, ... }: {
imports = [ ./common/user-account.nix ];
services.xserver.enable = true;
services.xserver.displayManager.sddm = {
enable = true;
autoLogin = {
enable = true;
user = "alice";
};
};
services.xserver.windowManager.default = "icewm";
services.xserver.windowManager.icewm.enable = true;
services.xserver.desktopManager.default = "none";
};
enableOCR = true;
testScript = { nodes, ... }: ''
startAll;
$machine->waitForWindow("^IceWM ");
'';
})

16
pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch → pkgs/applications/display-managers/sddm/0001-ignore-config-mtime.patch
View file

@ -1,8 +1,17 @@
From e9d82bfbc49993a5be2c93f6b72a969630587f26 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 23 Nov 2015 06:56:28 -0600
Subject: [PATCH 1/2] ignore config mtime
---
src/common/ConfigReader.cpp | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp
index 6618455..5356e76 100644
index cfc9940..5bf5a6a 100644
--- a/src/common/ConfigReader.cpp
+++ b/src/common/ConfigReader.cpp
@@ -136,11 +136,6 @@ namespace SDDM {
@@ -138,11 +138,6 @@ namespace SDDM {
QString currentSection = QStringLiteral(IMPLICIT_SECTION);
QFile in(m_path);
@ -14,3 +23,6 @@ index 6618455..5356e76 100644
in.open(QIODevice::ReadOnly);
while (!in.atEnd()) {
--
2.6.3

26
pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch Normal file
View file

@ -0,0 +1,26 @@
From 7a18f4cb77c567dec9ad924fcc76c50092de6ee7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 23 Nov 2015 06:57:51 -0600
Subject: [PATCH 2/2] fix ConfigReader QStringList corruption
---
src/common/ConfigReader.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp
index 5bf5a6a..34182e6 100644
--- a/src/common/ConfigReader.cpp
+++ b/src/common/ConfigReader.cpp
@@ -30,7 +30,8 @@
QTextStream &operator>>(QTextStream &str, QStringList &list) {
list.clear();
- foreach(const QStringRef &s, str.readLine().splitRef(QLatin1Char(',')))
+ QString line = str.readLine();
+ foreach(const QStringRef &s, line.splitRef(QLatin1Char(',')))
{
QStringRef trimmed = s.trimmed();
if (!trimmed.isEmpty())
--
2.6.3

5
pkgs/applications/display-managers/sddm/default.nix
View file

@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1";
};
patches = [ ./sddm-ignore-config-mtime.patch ];
patches = [
./0001-ignore-config-mtime.patch
./0002-fix-ConfigReader-QStringList-corruption.patch
];
nativeBuildInputs = [ cmake makeQtWrapper pkgconfig qttools ];

58
pkgs/applications/kde-apps-15.12/ark.nix Normal file
View file

@ -0,0 +1,58 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, karchive
, kconfig
, kcrash
, kdbusaddons
, ki18n
, kiconthemes
, khtml
, kio
, kservice
, kpty
, kwidgetsaddons
, libarchive
, p7zip
, unrar
, unzipNLS
, zip
}:
let PATH = lib.makeSearchPath "bin" [
p7zip unrar unzipNLS zip
];
in
kdeApp {
name = "ark";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
karchive
kconfig
kcrash
kdbusaddons
kiconthemes
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 ];
};
}

35
pkgs/applications/kde-apps-15.12/baloo-widgets.nix Normal file
View file

@ -0,0 +1,35 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, kconfig
, kio
, ki18n
, kservice
, kfilemetadata
, baloo
, kdelibs4support
}:
kdeApp {
name = "baloo-widgets";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
kconfig
kservice
];
propagatedBuildInputs = [
baloo
kdelibs4support
kfilemetadata
ki18n
kio
];
meta = {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

54
pkgs/applications/kde-apps-15.12/default.nix Normal file
View file

@ -0,0 +1,54 @@
# 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, debug ? false }:
let
inherit (pkgs) lib stdenv;
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
mirror = "mirror://kde";
kdeApp = import ./kde-app.nix {
inherit stdenv lib;
inherit debug srcs;
};
packages = self: with self; {
inherit (pkgs.kdeApps_15_08) kdelibs ksnapshot;
ark = callPackage ./ark.nix {};
baloo-widgets = callPackage ./baloo-widgets.nix {};
dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix {};
gpgmepp = callPackage ./gpgmepp.nix {};
gwenview = callPackage ./gwenview.nix {};
kate = callPackage ./kate.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
konsole = callPackage ./konsole.nix {};
libkdcraw = callPackage ./libkdcraw.nix {};
libkexiv2 = callPackage ./libkexiv2.nix {};
libkipi = callPackage ./libkipi.nix {};
okular = callPackage ./okular.nix {};
print-manager = callPackage ./print-manager.nix {};
l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
};
newScope = scope: pkgs.kf516.newScope ({ inherit kdeApp; } // scope);
in lib.makeScope newScope packages

31
pkgs/applications/kde-apps-15.12/dolphin-plugins.nix Normal file
View file

@ -0,0 +1,31 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, kxmlgui
, ki18n
, kio
, kdelibs4support
, dolphin
}:
kdeApp {
name = "dolphin-plugins";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
kxmlgui
dolphin
];
propagatedBuildInputs = [
kdelibs4support
ki18n
kio
];
meta = {
license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

70
pkgs/applications/kde-apps-15.12/dolphin.nix Normal file
View file

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

56
pkgs/applications/kde-apps-15.12/fetchsrcs.sh Executable file
View file

@ -0,0 +1,56 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils findutils gnused nix wget
set -x
# The trailing slash at the end is necessary!
WGET_ARGS='http://download.kde.org/unstable/applications/15.11.80/ -A *.tar.xz'
mkdir tmp; cd tmp
rm -f ../srcs.csv
wget -nH -r -c --no-parent $WGET_ARGS
find . | while read src; do
if [[ -f "${src}" ]]; then
# Sanitize file name
filename=$(basename "$src" | tr '@' '_')
nameVersion="${filename%.tar.*}"
name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
echo "$name,$version,$src,$filename" >>../srcs.csv
fi
done
cat >../srcs.nix <<EOF
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
{ fetchurl, mirror }:
{
EOF
gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
latestVersion=$(echo "$versions" | sort -rV | head -n 1)
src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
url="${src:2}"
sha256=$(nix-hash --type sha256 --base32 --flat "$src")
cat >>../srcs.nix <<EOF
$name = {
version = "$latestVersion";
src = fetchurl {
url = "\${mirror}/$url";
sha256 = "$sha256";
name = "$filename";
};
};
EOF
done
echo "}" >>../srcs.nix
rm -f ../srcs.csv
cd ..

21
pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix Normal file
View file

@ -0,0 +1,21 @@
{ kdeApp
, lib
, extra-cmake-modules
, ffmpeg
, kio
}:
kdeApp {
name = "ffmpegthumbs";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
ffmpeg
kio
];
meta = {
license = with lib.licenses; [ gpl2 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

21
pkgs/applications/kde-apps-15.12/gpgmepp.nix Normal file
View file

@ -0,0 +1,21 @@
{ kdeApp
, lib
, extra-cmake-modules
, boost
, gpgme
}:
kdeApp {
name = "gpgmepp";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
boost
gpgme
];
meta = {
license = with lib.licenses; [ lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

44
pkgs/applications/kde-apps-15.12/gwenview.nix Normal file
View file

@ -0,0 +1,44 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, makeQtWrapper
, baloo
, exiv2
, kactivities
, kdelibs4support
, kio
, lcms2
, phonon
, qtsvg
, qtx11extras
}:
kdeApp {
name = "gwenview";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
exiv2
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 ];
};
}

69
pkgs/applications/kde-apps-15.12/kate.nix Normal file
View file

@ -0,0 +1,69 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, qtscript
, kactivities
, kconfig
, kcrash
, kguiaddons
, kiconthemes
, ki18n
, kinit
, kjobwidgets
, kio
, kparts
, ktexteditor
, kwindowsystem
, kxmlgui
, kdbusaddons
, kwallet
, plasma-framework
, kitemmodels
, knotifications
, threadweaver
, knewstuff
, libgit2
}:
kdeApp {
name = "kate";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
qtscript
kconfig
kcrash
kguiaddons
kiconthemes
kinit
kjobwidgets
kparts
kxmlgui
kdbusaddons
kwallet
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.12/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.12/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.12/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 ""}
'';
})

23
pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix Normal file
View file

@ -0,0 +1,23 @@
{ kdeApp
, lib
, extra-cmake-modules
, kio
, libkexiv2
, libkdcraw
}:
kdeApp {
name = "kdegraphics-thumbnailers";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
kio
libkexiv2
libkdcraw
];
meta = {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

38
pkgs/applications/kde-apps-15.12/kgpg.nix Normal file
View file

@ -0,0 +1,38 @@
{ kdeApp
, lib
, automoc4
, cmake
, makeWrapper
, perl
, pkgconfig
, boost
, gpgme
, kdelibs
, kdepimlibs
, gnupg
}:
kdeApp {
name = "kgpg";
nativeBuildInputs = [
automoc4
cmake
makeWrapper
perl
pkgconfig
];
buildInputs = [
boost
gpgme
kdelibs
kdepimlibs
];
postInstall = ''
wrapProgram "$out/bin/kgpg" \
--prefix PATH : "${gnupg}/bin"
'';
meta = {
license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

68
pkgs/applications/kde-apps-15.12/konsole.nix Normal file
View file

@ -0,0 +1,68 @@
{ kdeApp
, lib
, extra-cmake-modules
, kdoctools
, makeQtWrapper
, qtscript
, kbookmarks
, kcompletion
, kconfig
, kconfigwidgets
, kcoreaddons
, kguiaddons
, ki18n
, kiconthemes
, kinit
, kdelibs4support
, kio
, knotifications
, knotifyconfig
, kparts
, kpty
, kservice
, ktextwidgets
, kwidgetsaddons
, kwindowsystem
, kxmlgui
}:
kdeApp {
name = "konsole";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
qtscript
kbookmarks
kcompletion
kconfig
kconfigwidgets
kcoreaddons
kguiaddons
kiconthemes
kinit
kio
knotifications
knotifyconfig
kparts
kpty
kservice
ktextwidgets
kwidgetsaddons
kxmlgui
];
propagatedBuildInputs = [
kdelibs4support
ki18n
kwindowsystem
];
postInstall = ''
wrapQtProgram "$out/bin/konsole"
'';
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

29
pkgs/applications/kde-apps-15.12/ksnapshot.nix Normal file
View file

@ -0,0 +1,29 @@
{ kdeApp
, lib
, automoc4
, cmake
, perl
, pkgconfig
, kdelibs
, libkipi
, libXfixes
}:
kdeApp {
name = "ksnapshot";
nativeBuildInputs = [
automoc4
cmake
perl
pkgconfig
];
buildInputs = [
kdelibs
libkipi
libXfixes
];
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

237
pkgs/applications/kde-apps-15.12/l10n.nix Normal file
View file

@ -0,0 +1,237 @@
{ 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" {}) {};
};
# TODO: build broken in 15.11.80; re-enable in next release
/*
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" {}) {};
};
# TODO: build broken in 15.11.80; re-enable in next release
/*
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" {}) {};
};
}

19
pkgs/applications/kde-apps-15.12/libkdcraw.nix Normal file
View file

@ -0,0 +1,19 @@
{ kdeApp
, lib
, extra-cmake-modules
, libraw
}:
kdeApp {
name = "libkdcraw";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libraw
];
meta = {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

19
pkgs/applications/kde-apps-15.12/libkexiv2.nix Normal file
View file

@ -0,0 +1,19 @@
{ kdeApp
, lib
, exiv2
, extra-cmake-modules
}:
kdeApp {
name = "libkexiv2";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
exiv2
];
meta = {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

22
pkgs/applications/kde-apps-15.12/libkipi.nix Normal file
View file

@ -0,0 +1,22 @@
{ kdeApp
, lib
, extra-cmake-modules
, kconfig
, ki18n
, kservice
, kxmlgui
}:
kdeApp {
name = "libkipi";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
kconfig ki18n kservice kxmlgui
];
meta = {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

41
pkgs/applications/kde-apps-15.12/okular.nix Normal file
View file

@ -0,0 +1,41 @@
{ kdeApp
, lib
, automoc4
, cmake
, perl
, pkgconfig
, kdelibs
, qimageblitz
, poppler_qt4
, libspectre
, libkexiv2
, djvulibre
, libtiff
, freetype
, ebook_tools
}:
kdeApp {
name = "okular";
nativeBuildInputs = [
automoc4
cmake
perl
pkgconfig
];
buildInputs = [
kdelibs
qimageblitz
poppler_qt4
libspectre
libkexiv2
djvulibre
libtiff
freetype
ebook_tools
];
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

47
pkgs/applications/kde-apps-15.12/print-manager.nix Normal file
View file

@ -0,0 +1,47 @@
{ kdeApp
, lib
, extra-cmake-modules
, qtdeclarative
, cups
, kconfig
, kconfigwidgets
, kdbusaddons
, kiconthemes
, ki18n
, kcmutils
, kio
, knotifications
, plasma-framework
, kwidgetsaddons
, kwindowsystem
, kitemviews
}:
kdeApp {
name = "print-manager";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
cups
kconfig
kconfigwidgets
kdbusaddons
kiconthemes
kcmutils
knotifications
kwidgetsaddons
kitemviews
];
propagatedBuildInputs = [
ki18n
kio
kwindowsystem
plasma-framework
qtdeclarative
];
meta = {
license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

1925
pkgs/applications/kde-apps-15.12/srcs.nix Normal file
View file

File diff suppressed because it is too large Load diff

23
pkgs/desktops/plasma-5.5/bluedevil.nix Normal file
View file

@ -0,0 +1,23 @@
{ 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 makeQtWrapper shared_mime_info
];
buildInputs = [
kcoreaddons kdbusaddons kded kiconthemes knotifications
kwidgetsaddons
];
propagatedBuildInputs = [
bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
];
postInstall = ''
wrapQtProgram "$out/bin/bluedevil-wizard"
wrapQtProgram "$out/bin/bluedevil-sendfile"
'';
}

29
pkgs/desktops/plasma-5.5/breeze-qt4.nix Normal file
View file

@ -0,0 +1,29 @@
{ plasmaPackage
, automoc4
, cmake
, perl
, pkgconfig
, kdelibs
, qt4
, xproto
}:
plasmaPackage {
name = "breeze-qt4";
sname = "breeze";
buildInputs = [
kdelibs
qt4
xproto
];
nativeBuildInputs = [
automoc4
cmake
perl
pkgconfig
];
cmakeFlags = [
"-DUSE_KDE4=ON"
"-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
];
}

23
pkgs/desktops/plasma-5.5/breeze-qt5.nix Normal file
View file

@ -0,0 +1,23 @@
{ plasmaPackage, extra-cmake-modules, frameworkintegration
, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons
, ki18n, kwindowsystem, makeQtWrapper, plasma-framework, qtx11extras
}:
plasmaPackage {
name = "breeze-qt5";
sname = "breeze";
nativeBuildInputs = [
extra-cmake-modules
makeQtWrapper
];
buildInputs = [
kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
];
propagatedBuildInputs = [
frameworkintegration ki18n kwindowsystem plasma-framework qtx11extras
];
cmakeFlags = [ "-DUSE_Qt4=OFF" ];
postInstall = ''
wrapQtProgram "$out/bin/breeze-settings5"
'';
}

85
pkgs/desktops/plasma-5.5/default.nix Normal file
View file

@ -0,0 +1,85 @@
# Maintainer's Notes:
#
# How To Update
# 1. Edit the URL in ./manifest.sh
# 2. Run ./manifest.sh
# 3. Fix build errors.
{ pkgs, debug ? false }:
let
inherit (pkgs) lib stdenv symlinkJoin;
kdeApps = pkgs.kdeApps_15_12;
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
mirror = "mirror://kde";
plasmaPackage = args:
let
inherit (args) name;
sname = args.sname or name;
inherit (srcs."${sname}") src version;
in stdenv.mkDerivation (args // {
name = "${name}-${version}";
inherit src;
setupHook = args.setupHook or ./setup-hook.sh;
cmakeFlags =
(args.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
} // (args.meta or {});
});
addPackages = self: with self; {
bluedevil = callPackage ./bluedevil.nix {};
breeze-qt4 = callPackage ./breeze-qt4.nix {};
breeze-qt5 = callPackage ./breeze-qt5.nix {};
breeze =
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 {};
kdecoration = callPackage ./kdecoration.nix {};
kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
kgamma5 = callPackage ./kgamma5.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
khotkeys = callPackage ./khotkeys.nix {};
kinfocenter = callPackage ./kinfocenter.nix {};
kmenuedit = callPackage ./kmenuedit.nix {};
kscreen = callPackage ./kscreen.nix {};
kscreenlocker = callPackage ./kscreenlocker.nix {};
ksshaskpass = callPackage ./ksshaskpass.nix {};
ksysguard = callPackage ./ksysguard.nix {};
kwayland = callPackage ./kwayland.nix {};
kwin = callPackage ./kwin {};
kwrited = callPackage ./kwrited.nix {};
libkscreen = callPackage ./libkscreen {};
libksysguard = callPackage ./libksysguard {};
milou = callPackage ./milou.nix {};
oxygen = callPackage ./oxygen.nix {};
plasma-desktop = callPackage ./plasma-desktop {};
plasma-mediacenter = callPackage ./plasma-mediacenter.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 {};
polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
powerdevil = callPackage ./powerdevil.nix {};
systemsettings = callPackage ./systemsettings.nix {};
};
newScope = scope: kdeApps.newScope ({ inherit plasmaPackage; } // scope);
in lib.makeScope newScope addPackages

57
pkgs/desktops/plasma-5.5/fetchsrcs.sh Executable file
View file

@ -0,0 +1,57 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils findutils gawk gnused nix wget
set -x
# The trailing slash at the end is necessary!
RELEASE_URL="http://download.kde.org/unstable/plasma/5.4.95/"
EXTRA_WGET_ARGS='-A *.tar.xz'
mkdir tmp; cd tmp
rm -f ../srcs.csv
wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
find . | while read src; do
if [[ -f "${src}" ]]; then
# Sanitize file name
filename=$(basename "$src" | tr '@' '_')
nameVersion="${filename%.tar.*}"
name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
echo "$name,$version,$src,$filename" >>../srcs.csv
fi
done
cat >../srcs.nix <<EOF
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
{ fetchurl, mirror }:
{
EOF
gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
latestVersion=$(echo "$versions" | sort -rV | head -n 1)
src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
url="${src:2}"
sha256=$(nix-hash --type sha256 --base32 --flat "$src")
cat >>../srcs.nix <<EOF
$name = {
version = "$latestVersion";
src = fetchurl {
url = "\${mirror}/$url";
sha256 = "$sha256";
name = "$filename";
};
};
EOF
done
echo "}" >>../srcs.nix
rm -f ../srcs.csv
cd ..

27
pkgs/desktops/plasma-5.5/kde-cli-tools.nix Normal file
View file

@ -0,0 +1,27 @@
{ 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 makeQtWrapper ];
buildInputs = [
kcmutils kconfig kdesu kiconthemes
];
propagatedBuildInputs = [
kdelibs4support ki18n kwindowsystem qtsvg qtx11extras
];
postInstall = ''
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.5/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

28
pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ plasmaPackage
, extra-cmake-modules
, glib
, gtk2
, gtk3
, karchive
, kcmutils
, kconfigwidgets
, ki18n
, kiconthemes
, kio
, knewstuff
}:
plasmaPackage {
name = "kde-gtk-config";
patches = [ ./0001-follow-symlinks.patch ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
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"
];
}

6
pkgs/desktops/plasma-5.5/kdecoration.nix Normal file
View file

@ -0,0 +1,6 @@
{ plasmaPackage, extra-cmake-modules }:
plasmaPackage {
name = "kdecoration";
nativeBuildInputs = [ extra-cmake-modules ];
}

21
pkgs/desktops/plasma-5.5/kdeplasma-addons.nix Normal file
View file

@ -0,0 +1,21 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig
, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
, kio, knewstuff, kross, krunner, kservice, kunitconversion
, plasma-framework, qtdeclarative, qtx11extras
}:
plasmaPackage {
name = "kdeplasma-addons";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
ibus kconfig kconfigwidgets kcoreaddons kcmutils
knewstuff kservice kunitconversion
];
propagatedBuildInputs = [
kdelibs4support kio kross krunner plasma-framework qtdeclarative
qtx11extras
];
}

9
pkgs/desktops/plasma-5.5/kgamma5.nix Normal file
View file

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

20
pkgs/desktops/plasma-5.5/khelpcenter.nix Normal file
View file

@ -0,0 +1,20 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support
, khtml, kservice, makeQtWrapper
}:
plasmaPackage {
name = "khelpcenter";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
kconfig kcoreaddons kdbusaddons kinit kcmutils kservice
];
propagatedBuildInputs = [ kdelibs4support khtml ki18n ];
postInstall = ''
wrapQtProgram "$out/bin/khelpcenter"
'';
}

16
pkgs/desktops/plasma-5.5/khotkeys.nix Normal file
View file

@ -0,0 +1,16 @@
{ 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 ];
buildInputs = [
kcmutils kdbusaddons kxmlgui
];
propagatedBuildInputs = [
kdelibs4support kglobalaccel ki18n kio plasma-framework
plasma-workspace qtx11extras
];
}

24
pkgs/desktops/plasma-5.5/kinfocenter.nix Normal file
View file

@ -0,0 +1,24 @@
{ 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 {
name = "kinfocenter";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
kdbusaddons kiconthemes kpackage kservice kwidgetsaddons
kxmlgui libraw1394 pciutils solid
];
propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ];
postInstall = ''
wrapQtProgram "$out/bin/kinfocenter"
'';
}

19
pkgs/desktops/plasma-5.5/kmenuedit.nix Normal file
View file

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

19
pkgs/desktops/plasma-5.5/kscreen.nix Normal file
View file

@ -0,0 +1,19 @@
{ 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 kwidgetsaddons kxmlgui
];
propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ];
postInstall = ''
wrapQtProgram "$out/bin/kscreen-console"
'';
}

19
pkgs/desktops/plasma-5.5/kscreenlocker.nix Normal file
View file

@ -0,0 +1,19 @@
{ plasmaPackage, extra-cmake-modules, kcmutils, kcrash, kdeclarative
, kdelibs4support, kdoctools, kglobalaccel, kidletime, kwayland
, libXcursor, pam, plasma-framework, qtdeclarative, wayland
}:
plasmaPackage {
name = "kscreenlocker";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
kcmutils kcrash kdelibs4support kglobalaccel kidletime kwayland
libXcursor pam wayland
];
propagatedBuildInputs = [
kdeclarative plasma-framework qtdeclarative
];
}

13
pkgs/desktops/plasma-5.5/ksshaskpass.nix Normal file
View file

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

20
pkgs/desktops/plasma-5.5/ksysguard.nix Normal file
View file

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

14
pkgs/desktops/plasma-5.5/kwayland.nix Normal file
View file

@ -0,0 +1,14 @@
{ plasmaPackage
, extra-cmake-modules
, wayland
}:
plasmaPackage {
name = "kwayland";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
wayland
];
}

25
pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch Normal file
View file

@ -0,0 +1,25 @@
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 781c960..ad5f420 100644
--- a/clients/aurorae/src/aurorae.cpp
+++ b/clients/aurorae/src/aurorae.cpp
@@ -211,7 +211,7 @@ void Helper::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();
--
2.5.2

33
pkgs/desktops/plasma-5.5/kwin/default.nix Normal file
View file

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

10
pkgs/desktops/plasma-5.5/kwrited.nix Normal file
View file

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

18
pkgs/desktops/plasma-5.5/libkscreen/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ plasmaPackage
, extra-cmake-modules
, libXrandr
, qtx11extras
}:
plasmaPackage {
name = "libkscreen";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libXrandr
];
propagatedBuildInputs = [
qtx11extras
];
}

130
pkgs/desktops/plasma-5.5/libkscreen/libkscreen-backend-path.patch Normal file
View file

@ -0,0 +1,130 @@
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}"

25
pkgs/desktops/plasma-5.5/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.5/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
];
}

17
pkgs/desktops/plasma-5.5/milou.nix Normal file
View file

@ -0,0 +1,17 @@
{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative
, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
, krunner
}:
plasmaPackage {
name = "milou";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
qtscript kcoreaddons kservice
];
propagatedBuildInputs = [
kdeclarative ki18n krunner plasma-framework qtdeclarative
];
}

20
pkgs/desktops/plasma-5.5/oxygen.nix Normal file
View file

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

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

@ -0,0 +1,67 @@
From 7c379686def9f15be1aa8fa4b5358124f7ed57c6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 19 Oct 2015 18:45:36 -0500
Subject: [PATCH 1/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 422e8f7..3c8906e 100644
--- a/containments/desktop/package/contents/ui/main.qml
+++ b/containments/desktop/package/contents/ui/main.qml
@@ -29,7 +29,7 @@ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
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 bad6ba0..b1fc331 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.6.3

36
pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch Normal file
View file

@ -0,0 +1,36 @@
From d0056fa6c1158408db169a7f5e6eb75691083094 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 22 Nov 2015 09:34:43 -0600
Subject: [PATCH 2/3] hwclock
---
kcms/dateandtime/helper.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
index e955f0c..5171753 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 = QStringLiteral("/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(QStringLiteral("hwclock"), exePath);
+ QString hwclock = "@hwclock@";
if (!hwclock.isEmpty()) {
KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));
}
--
2.6.3

30
pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch Normal file
View file

@ -0,0 +1,30 @@
From 0a8e2ae5cb64c5762408df920d99459b20d52b29 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 22 Nov 2015 09:39:24 -0600
Subject: [PATCH 3/3] tzdir
---
kcms/dateandtime/helper.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
index 5171753..92b5d9e 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;
+ QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR"));
+ QString tz = tzdir + "/" + selectedzone;
+ if (tzdir.isEmpty()) {
+ // Standard Linux path
+ tz = "/usr/share/zoneinfo/" + selectedzone;
+ }
if (QFile::exists(tz)) { // make sure the new TZ really exists
QFile::remove(QStringLiteral("/etc/localtime"));
--
2.6.3

59
pkgs/desktops/plasma-5.5/plasma-desktop/default.nix Normal file
View file

@ -0,0 +1,59 @@
{ 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 rec {
name = "plasma-desktop";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
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 = [
./0001-qt-5.5-QML-import-paths.patch
(substituteAll {
src = ./0002-hwclock.patch;
hwclock = "${utillinux}/sbin/hwclock";
})
./0003-tzdir.patch
];
NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ];
cmakeFlags = [
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg"
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"
];
postInstall = ''
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"
'';
}

23
pkgs/desktops/plasma-5.5/plasma-mediacenter.nix Normal file
View file

@ -0,0 +1,23 @@
{ plasmaPackage, extra-cmake-modules, baloo, kactivities, kconfig
, kcoreaddons, kdeclarative, kguiaddons, ki18n, kio, kservice
, kfilemetadata, plasma-framework, qtdeclarative, qtmultimedia
, taglib
}:
plasmaPackage rec {
name = "plasma-mediacenter";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
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;
}

25
pkgs/desktops/plasma-5.5/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.5/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
, qca-qt5, 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 qca-qt5 solid
];
propagatedBuildInputs = [
kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
qtdeclarative
];
postInstall = ''
wrapQtProgram "$out/bin/kde5-nm-connection-editor"
'';
}

18
pkgs/desktops/plasma-5.5/plasma-pa.nix Normal file
View file

@ -0,0 +1,18 @@
{ plasmaPackage, extra-cmake-modules, glib, kdoctools, kconfigwidgets
, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio
, plasma-framework
}:
plasmaPackage {
name = "plasma-pa";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
glib kconfigwidgets kcoreaddons libpulseaudio
];
propagatedBuildInputs = [
kdeclarative kglobalaccel ki18n plasma-framework
];
}

10
pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix Normal file
View file

@ -0,0 +1,10 @@
{ plasmaPackage
, extra-cmake-modules
}:
plasmaPackage {
name = "plasma-workspace-wallpapers";
nativeBuildInputs = [
extra-cmake-modules
];
}

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

@ -0,0 +1,123 @@
From 1b95c8c95fb8ea097bb5236b19962c7feff9f333 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 19 Oct 2015 18:55:36 -0500
Subject: [PATCH 1/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 d32e7b7..828c5fb 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.3

397
pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch Normal file
View file

@ -0,0 +1,397 @@
From 8e5cf662d55415a838ce8c53f854202257e9feb4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 22 Nov 2015 08:31:42 -0600
Subject: [PATCH 2/2] startkde NixOS patches
---
startkde/startkde.cmake | 211 ++++++++++++++++++++----------------------------
1 file changed, 89 insertions(+), 122 deletions(-)
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 41a8975..130578e 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=$(@qttools@/bin/qtpaths --writable-path GenericConfigLocation)
+mkdir -p "$configDir"
#This is basically setting defaults so we can use them with kstartupconfig5
cat >$configDir/startupconfigkeys <<EOF
@@ -101,42 +106,10 @@ XftSubPixel=none
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="@KDE_INSTALL_FULL_DATADIR@"
-
-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="@@KDE_INSTALL_FULL_DATADIR@/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
@@ -145,9 +118,11 @@ 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"
if test $? -eq 10; then
@@ -163,21 +138,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 @qttools@/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)
;;
@@ -200,8 +193,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=$(@qttools@/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
@@ -231,7 +223,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
@@ -244,23 +236,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
@@ -273,26 +255,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
-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
@@ -317,11 +279,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
@@ -331,11 +293,11 @@ 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
# ...and also to kwalletd5
if test -n "$PAM_KWALLET5_LOGIN" ; then
- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
+ env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
fi
# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
@@ -348,21 +310,26 @@ 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
@@ -378,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 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
+@kinit@/bin/kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/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 @qttools@/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"
+ @qttools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
+ @qttools@/bin/qdbus "$address" "/MainApplication" "quit"
done
break
fi
@@ -410,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.6.3

62
pkgs/desktops/plasma-5.5/plasma-workspace/default.nix Normal file
View file

@ -0,0 +1,62 @@
{ 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 rec {
name = "plasma-workspace";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff
knotifyconfig kpackage ktextwidgets kwallet kwayland kxmlrpcclient
libdbusmenu libSM libXcursor networkmanager-qt pam phonon
qtscript wayland
];
propagatedBuildInputs = [
baloo kactivities kdeclarative kdelibs4support kglobalaccel
kidletime krunner ktexteditor kwin libkscreen libksysguard
plasma-framework qtquick1 qtquickcontrols qtx11extras solid
];
patches = [
./0001-qt-5.5-QML-import-paths.patch
./0002-startkde-NixOS-patches.patch
];
inherit bash coreutils gnused gnugrep socat;
inherit kconfig kinit kservice qttools;
inherit dbus_tools mkfontdir xmessage xprop xrdb xset xsetroot;
postPatch = ''
substituteAllInPlace startkde/startkde.cmake
substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
--replace kdostartupconfig5 $out/bin/kdostartupconfig5
'';
postInstall = ''
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"
rm "$out/lib/libexec/startplasma"
'';
}

31
pkgs/desktops/plasma-5.5/polkit-kde-agent.nix Normal file
View file

@ -0,0 +1,31 @@
{ plasmaPackage
, extra-cmake-modules
, ki18n
, kwindowsystem
, kdbusaddons
, kwidgetsaddons
, kcoreaddons
, kcrash
, kconfig
, kiconthemes
, knotifications
, polkitQt
}:
plasmaPackage {
name = "polkit-kde-agent";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
kdbusaddons
kwidgetsaddons
kcoreaddons
kcrash
kconfig
kiconthemes
knotifications
polkitQt
];
propagatedBuildInputs = [ ki18n kwindowsystem ];
}

20
pkgs/desktops/plasma-5.5/powerdevil.nix Normal file
View file

@ -0,0 +1,20 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities
, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
, kidletime, kio, knotifyconfig, kwayland, libkscreen, plasma-workspace
, qtx11extras, solid, udev
}:
plasmaPackage {
name = "powerdevil";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
kconfig kdbusaddons knotifyconfig solid udev
];
propagatedBuildInputs = [
kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime
kwayland libkscreen plasma-workspace qtx11extras
];
}

1
pkgs/desktops/plasma-5.5/setup-hook.sh Normal file
View file

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

309
pkgs/desktops/plasma-5.5/srcs.nix Normal file
View file

@ -0,0 +1,309 @@
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
{ fetchurl, mirror }:
{
bluedevil = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/bluedevil-5.4.95.tar.xz";
sha256 = "0ffd6vw3g0psysc4qwac55r9p32rl7jwvmwc468rpp9xvh52lx4p";
name = "bluedevil-5.4.95.tar.xz";
};
};
breeze = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/breeze-5.4.95.tar.xz";
sha256 = "1xvxykmzp6i2qh6zgdwh1hj6pcfll7y3b63ypivnggi96crynxyr";
name = "breeze-5.4.95.tar.xz";
};
};
breeze-gtk = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/breeze-gtk-5.4.95.tar.xz";
sha256 = "1f8qfnm6qyxkar0kw0ryls8z19hk14vlkk1zvm19h0i2fhihgnqg";
name = "breeze-gtk-5.4.95.tar.xz";
};
};
discover = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/discover-5.4.95.tar.xz";
sha256 = "1sj2b7sg23ahjix7xnwx3yja1iz8373c3dirgzr0ggwvqb5q5miz";
name = "discover-5.4.95.tar.xz";
};
};
kde-cli-tools = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kde-cli-tools-5.4.95.tar.xz";
sha256 = "0mh0bjjjji00nrsqr3988qh43jj7i4h7z2lpp2h1i0ykjczjmpj3";
name = "kde-cli-tools-5.4.95.tar.xz";
};
};
kdecoration = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kdecoration-5.4.95.tar.xz";
sha256 = "1hbdr9nc50438lrrkdij7mdlg8sclaww1ky4rs0c067gnjgqlff3";
name = "kdecoration-5.4.95.tar.xz";
};
};
kde-gtk-config = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kde-gtk-config-5.4.95.tar.xz";
sha256 = "17l9ypm5b4s8580zi2maxlszh890svcrh1jq3czz10izlmhd1zih";
name = "kde-gtk-config-5.4.95.tar.xz";
};
};
kdeplasma-addons = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kdeplasma-addons-5.4.95.tar.xz";
sha256 = "1a3d96pii6ljvr1sv4v1n5zqmpp0iv1la8jd44bj12d2xhrng7zq";
name = "kdeplasma-addons-5.4.95.tar.xz";
};
};
kgamma5 = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kgamma5-5.4.95.tar.xz";
sha256 = "0jpbd4342k8327ibwxwaam99gxc0h4bz3w0xk3chjv8jj2b3znnk";
name = "kgamma5-5.4.95.tar.xz";
};
};
khelpcenter = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/khelpcenter-5.4.95.tar.xz";
sha256 = "09vrqjysz20pwcrkk2713jin062prz75h6hsc2swhz873ks3krb4";
name = "khelpcenter-5.4.95.tar.xz";
};
};
khotkeys = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/khotkeys-5.4.95.tar.xz";
sha256 = "1haxxvs6nbva2x4i3ydx01hci2sfldqf9jdapl311hlliv7055bv";
name = "khotkeys-5.4.95.tar.xz";
};
};
kinfocenter = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kinfocenter-5.4.95.tar.xz";
sha256 = "1xz7k8xqzhk8y652h1gixi6bkbz041k0b3di0c5a1wpa78pzxwjb";
name = "kinfocenter-5.4.95.tar.xz";
};
};
kmenuedit = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kmenuedit-5.4.95.tar.xz";
sha256 = "1p3agzz2zp1jbdd820kql5064my9lzbk3b8yzli0242gc36sjagq";
name = "kmenuedit-5.4.95.tar.xz";
};
};
kscreen = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kscreen-5.4.95.tar.xz";
sha256 = "1viwy2ia681nkw89n796r4irlf0za1fbhspmnsjw52i9c6ccard5";
name = "kscreen-5.4.95.tar.xz";
};
};
kscreenlocker = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kscreenlocker-5.4.95.tar.xz";
sha256 = "08q2d39yfzfx69b6q0qsh3wlcqp6sh80jxaml2m1l8ksn354ldrg";
name = "kscreenlocker-5.4.95.tar.xz";
};
};
ksshaskpass = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/ksshaskpass-5.4.95.tar.xz";
sha256 = "18k4200ji1k6xb6n5x3s76yx3izqaisb3m7q3icycyzxfq7y50b4";
name = "ksshaskpass-5.4.95.tar.xz";
};
};
ksysguard = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/ksysguard-5.4.95.tar.xz";
sha256 = "1bjrap38zpvnxgvm6xnzvwjqdnbj6ygmgv2qpyl12nkv5r12rr73";
name = "ksysguard-5.4.95.tar.xz";
};
};
kwallet-pam = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kwallet-pam-5.4.95.tar.xz";
sha256 = "0vvhx582bk8hvfw3r7518g7vw104az31w6hpah7ki8kvfh35nh65";
name = "kwallet-pam-5.4.95.tar.xz";
};
};
kwayland = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kwayland-5.4.95.tar.xz";
sha256 = "0w4d2abxkmxgqfg1xg49x04av85lybkr6ymbpirrkfv5wwhgcnqy";
name = "kwayland-5.4.95.tar.xz";
};
};
kwayland-integration = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kwayland-integration-5.4.95.tar.xz";
sha256 = "1c52hfshnw9b6qi0xb1vrwg39akd57q7mjc7a5wh3kn873v23jj6";
name = "kwayland-integration-5.4.95.tar.xz";
};
};
kwin = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kwin-5.4.95.tar.xz";
sha256 = "09dw1vpcf20as8s172vf0mfxq1lrdmwl9m19b1pnpdi71fmmabhy";
name = "kwin-5.4.95.tar.xz";
};
};
kwrited = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kwrited-5.4.95.tar.xz";
sha256 = "1bzhx8yzwcx78mqkr24pcf9vdh9dbb0rd18pwhyw3xaib2gwiry2";
name = "kwrited-5.4.95.tar.xz";
};
};
libkscreen = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/libkscreen-5.4.95.tar.xz";
sha256 = "1hpjylkhlfd2h9rc13widyayfgvmwy2dqkc59m1lkf8qgdq6h0sa";
name = "libkscreen-5.4.95.tar.xz";
};
};
libksysguard = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/libksysguard-5.4.95.tar.xz";
sha256 = "0kcxl1pjakk1l27hnc819r0319gpxzrhvq31mzhdfm3lcskjngzi";
name = "libksysguard-5.4.95.tar.xz";
};
};
milou = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/milou-5.4.95.tar.xz";
sha256 = "09dz4jjb6adsgwx5qwdzzhwaianlfzs2hwx4qc366yj3hxrch13d";
name = "milou-5.4.95.tar.xz";
};
};
oxygen = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/oxygen-5.4.95.tar.xz";
sha256 = "0j94yabkwlgnl2zq0wrcwrh6d9j193mf68b310nz2dfskq5wgvr5";
name = "oxygen-5.4.95.tar.xz";
};
};
plasma-desktop = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-desktop-5.4.95.tar.xz";
sha256 = "0rar2ms65jks0knkv9x0gb5f1gp0yhghpskzcpm4m0gj981vbgyp";
name = "plasma-desktop-5.4.95.tar.xz";
};
};
plasma-mediacenter = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-mediacenter-5.4.95.tar.xz";
sha256 = "0kzghc8whc87v1ljlxva2k3sx7c2zmvgmp3i2z2lnp7h882a1hak";
name = "plasma-mediacenter-5.4.95.tar.xz";
};
};
plasma-nm = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-nm-5.4.95.tar.xz";
sha256 = "0cwc72lklv97yahh1672bqamlhil12b4wpjy2diqmq75xmajzjds";
name = "plasma-nm-5.4.95.tar.xz";
};
};
plasma-pa = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-pa-5.4.95.tar.xz";
sha256 = "0mvxidlzl9nw52sl9r5z180c683iz1a7rr0yh0v88gl30brrqnmw";
name = "plasma-pa-5.4.95.tar.xz";
};
};
plasma-sdk = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-sdk-5.4.95.tar.xz";
sha256 = "1lis04qmbca8n2ly2g58xhi3znca14dmib81rfshjqp9rldc2z6k";
name = "plasma-sdk-5.4.95.tar.xz";
};
};
plasma-workspace = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-workspace-5.4.95.tar.xz";
sha256 = "1af2qx5q5pbxyv32fjiwn7cwf5z1xrgj5n22fprsfn1pyjnz4anv";
name = "plasma-workspace-5.4.95.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-workspace-wallpapers-5.4.95.tar.xz";
sha256 = "0bz0hk6bnm14ppnglwjd82w9gyjm5smv7cpicj25cfwlvz3qjizz";
name = "plasma-workspace-wallpapers-5.4.95.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/polkit-kde-agent-1-5.4.95.tar.xz";
sha256 = "0hc4a36fxn5bw77hldpklj5dwxxx3c67pni9q8d9bpdk52d89wcg";
name = "polkit-kde-agent-1-5.4.95.tar.xz";
};
};
powerdevil = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/powerdevil-5.4.95.tar.xz";
sha256 = "0q3a3d654f3k4qjwq8avk2n0ppila3p8l9kkayd5hcasvvhcihq7";
name = "powerdevil-5.4.95.tar.xz";
};
};
sddm-kcm = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/sddm-kcm-5.4.95.tar.xz";
sha256 = "06i24nqn80j563cw2rsfficyd577j3v7qj83cvn6jwrkhbhc6v45";
name = "sddm-kcm-5.4.95.tar.xz";
};
};
systemsettings = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/systemsettings-5.4.95.tar.xz";
sha256 = "0zr7chjk43mqbb74p4n5n4ny783j8bnmwa4cr86i21bcbkqgp6sq";
name = "systemsettings-5.4.95.tar.xz";
};
};
user-manager = {
version = "5.4.95";
src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/user-manager-5.4.95.tar.xz";
sha256 = "1dbfqb0w3cgkhimw195gwh9cnnx83qacqdc8j5dpvrjybv3ihv3z";
name = "user-manager-5.4.95.tar.xz";
};
};
}

21
pkgs/desktops/plasma-5.5/systemsettings.nix Normal file
View file

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

11
pkgs/development/libraries/kde-frameworks-5.16/attica.nix Normal file
View file

@ -0,0 +1,11 @@
{ kdeFramework, lib
, extra-cmake-modules
}:
kdeFramework {
name = "attica";
nativeBuildInputs = [ extra-cmake-modules ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

25
pkgs/development/libraries/kde-frameworks-5.16/baloo.nix Normal file
View file

@ -0,0 +1,25 @@
{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
}:
kdeFramework {
name = "baloo";
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [
kconfig kcrash kdbusaddons lmdb qtquick1 solid
];
propagatedBuildInputs = [
kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
];
postInstall = ''
wrapQtProgram "$out/bin/baloo_file"
wrapQtProgram "$out/bin/baloo_file_extractor"
wrapQtProgram "$out/bin/balooctl"
wrapQtProgram "$out/bin/baloosearch"
wrapQtProgram "$out/bin/balooshow"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

17
pkgs/development/libraries/kde-frameworks-5.16/bluez-qt.nix Normal file
View file

@ -0,0 +1,17 @@
{ kdeFramework, lib
, extra-cmake-modules
, qtdeclarative
}:
kdeFramework {
name = "bluez-qt";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtdeclarative ];
preConfigure = ''
substituteInPlace CMakeLists.txt \
--replace /lib/udev/rules.d "$out/lib/udev/rules.d"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

113
pkgs/development/libraries/kde-frameworks-5.16/default.nix Normal file
View file

@ -0,0 +1,113 @@
# Maintainer's Notes:
#
# How To Update
# 1. Edit the URL in ./manifest.sh
# 2. Run ./manifest.sh
# 3. Fix build errors.
{ pkgs, debug ? false }:
let
inherit (pkgs) lib makeSetupHook stdenv;
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
kdeFramework = args:
let
inherit (args) name;
inherit (srcs."${name}") 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 = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
} // (args.meta or {});
});
addPackages = self: with self; {
attica = callPackage ./attica.nix {};
baloo = callPackage ./baloo.nix {};
bluez-qt = callPackage ./bluez-qt.nix {};
extra-cmake-modules = callPackage ./extra-cmake-modules {};
frameworkintegration = callPackage ./frameworkintegration.nix {};
kactivities = callPackage ./kactivities.nix {};
kapidox = callPackage ./kapidox.nix {};
karchive = callPackage ./karchive.nix {};
kauth = callPackage ./kauth {};
kbookmarks = callPackage ./kbookmarks.nix {};
kcmutils = callPackage ./kcmutils {};
kcodecs = callPackage ./kcodecs.nix {};
kcompletion = callPackage ./kcompletion.nix {};
kconfig = callPackage ./kconfig.nix {};
kconfigwidgets = callPackage ./kconfigwidgets {};
kcoreaddons = callPackage ./kcoreaddons.nix {};
kcrash = callPackage ./kcrash.nix {};
kdbusaddons = callPackage ./kdbusaddons.nix {};
kdeclarative = callPackage ./kdeclarative.nix {};
kded = callPackage ./kded.nix {};
kdelibs4support = callPackage ./kdelibs4support.nix {};
kdesignerplugin = callPackage ./kdesignerplugin.nix {};
kdewebkit = callPackage ./kdewebkit.nix {};
kdesu = callPackage ./kdesu.nix {};
kdnssd = callPackage ./kdnssd.nix {};
kdoctools = callPackage ./kdoctools {};
kemoticons = callPackage ./kemoticons.nix {};
kfilemetadata = callPackage ./kfilemetadata.nix {};
kglobalaccel = callPackage ./kglobalaccel.nix {};
kguiaddons = callPackage ./kguiaddons.nix {};
khtml = callPackage ./khtml.nix {};
ki18n = callPackage ./ki18n.nix {};
kiconthemes = callPackage ./kiconthemes.nix {};
kidletime = callPackage ./kidletime.nix {};
kimageformats = callPackage ./kimageformats.nix {};
kinit = callPackage ./kinit {};
kio = callPackage ./kio.nix {};
kitemmodels = callPackage ./kitemmodels.nix {};
kitemviews = callPackage ./kitemviews.nix {};
kjobwidgets = callPackage ./kjobwidgets.nix {};
kjs = callPackage ./kjs.nix {};
kjsembed = callPackage ./kjsembed.nix {};
kmediaplayer = callPackage ./kmediaplayer.nix {};
knewstuff = callPackage ./knewstuff.nix {};
knotifications = callPackage ./knotifications.nix {};
knotifyconfig = callPackage ./knotifyconfig.nix {};
kpackage = callPackage ./kpackage {};
kparts = callPackage ./kparts.nix {};
kpeople = callPackage ./kpeople.nix {};
kplotting = callPackage ./kplotting.nix {};
kpty = callPackage ./kpty.nix {};
kross = callPackage ./kross.nix {};
krunner = callPackage ./krunner.nix {};
kservice = callPackage ./kservice {};
ktexteditor = callPackage ./ktexteditor {};
ktextwidgets = callPackage ./ktextwidgets.nix {};
kunitconversion = callPackage ./kunitconversion.nix {};
kwallet = callPackage ./kwallet.nix {};
kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
kwindowsystem = callPackage ./kwindowsystem.nix {};
kxmlgui = callPackage ./kxmlgui.nix {};
kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
modemmanager-qt = callPackage ./modemmanager-qt.nix {};
networkmanager-qt = callPackage ./networkmanager-qt.nix {};
oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
plasma-framework = callPackage ./plasma-framework {};
solid = callPackage ./solid.nix {};
sonnet = callPackage ./sonnet.nix {};
threadweaver = callPackage ./threadweaver.nix {};
};
newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope);
in lib.makeScope newScope addPackages

74
pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/0001-extra-cmake-modules-paths.patch Normal file
View file

@ -0,0 +1,74 @@
From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 20 Feb 2015 23:17:39 -0600
Subject: [PATCH] extra-cmake-modules paths
---
kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
1 file changed, 4 insertions(+), 33 deletions(-)
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index b7cd34d..2f868ac 100644
--- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake
@@ -193,37 +193,8 @@
# (To distribute this file outside of extra-cmake-modules, substitute the full
# License text for the above reference.)
-# Figure out what the default install directory for libraries should be.
-# This is based on the logic in GNUInstallDirs, but simplified (the
-# GNUInstallDirs code deals with re-configuring, but that is dealt with
-# by the _define_* macros in this module).
+# The default library directory on NixOS is *always* /lib.
set(_LIBDIR_DEFAULT "lib")
-# Override this default 'lib' with 'lib64' iff:
-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
-# - we are NOT on debian
-# - we are on a 64 bits system
-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
-# See http://wiki.debian.org/Multiarch
-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
- AND NOT CMAKE_CROSSCOMPILING)
- if (EXISTS "/etc/debian_version") # is this a debian system ?
- if(CMAKE_LIBRARY_ARCHITECTURE)
- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
- endif()
- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
- if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
- message(AUTHOR_WARNING
- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
- "Please enable at least one language before including KDEInstallDirs.")
- else()
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
- set(_LIBDIR_DEFAULT "lib64")
- endif()
- endif()
- endif()
-endif()
set(_gnu_install_dirs_vars
BINDIR
@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
"QtQuick2 imports"
QML_INSTALL_DIR)
else()
- _define_relative(QTPLUGINDIR LIBDIR "plugins"
+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
"Qt plugins"
QT_PLUGIN_INSTALL_DIR)
- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
"QtQuick1 imports"
IMPORTS_INSTALL_DIR)
- _define_relative(QMLDIR LIBDIR "qml"
+ _define_relative(QMLDIR LIBDIR "qt5/qml"
"QtQuick2 imports"
QML_INSTALL_DIR)
endif()
--
2.3.0

18
pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }:
kdeFramework {
name = "extra-cmake-modules";
patches = [ ./0001-extra-cmake-modules-paths.patch ];
setupHook = ./setup-hook.sh;
# It is OK to propagate these inputs as long as
# extra-cmake-modules is never a propagated input
# of some other derivation.
propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
meta = {
license = stdenv.lib.licenses.bsd2;
maintainers = [ lib.maintainers.ttuegel ];
};
}

27
pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/setup-hook.sh Normal file
View file

@ -0,0 +1,27 @@
addMimePkg() {
local propagated
if [[ -d "$1/share/mime" ]]; then
propagated=
for pkg in $propagatedBuildInputs; do
if [[ "z$pkg" == "z$1" ]]; then
propagated=1
fi
done
if [[ -z $propagated ]]; then
propagatedBuildInputs="$propagatedBuildInputs $1"
fi
propagated=
for pkg in $propagatedUserEnvPkgs; do
if [[ "z$pkg" == "z$1" ]]; then
propagated=1
fi
done
if [[ -z $propagated ]]; then
propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
fi
fi
}
envHooks+=(addMimePkg)

57
pkgs/development/libraries/kde-frameworks-5.16/fetchsrcs.sh Executable file
View file

@ -0,0 +1,57 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils findutils gnused nix wget
set -x
# The trailing slash at the end is necessary!
RELEASE_URL="http://download.kde.org/stable/frameworks/5.16/"
EXTRA_WGET_ARGS='-A *.tar.xz'
mkdir tmp; cd tmp
rm -f ../srcs.csv
wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
find . | while read src; do
if [[ -f "${src}" ]]; then
# Sanitize file name
filename=$(basename "$src" | tr '@' '_')
nameVersion="${filename%.tar.*}"
name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
echo "$name,$version,$src,$filename" >>../srcs.csv
fi
done
cat >../srcs.nix <<EOF
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
{ fetchurl, mirror }:
{
EOF
gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
latestVersion=$(echo "$versions" | sort -rV | head -n 1)
src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
url="${src:2}"
sha256=$(nix-hash --type sha256 --base32 --flat "$src")
cat >>../srcs.nix <<EOF
$name = {
version = "$latestVersion";
src = fetchurl {
url = "\${mirror}/$url";
sha256 = "$sha256";
name = "$filename";
};
};
EOF
done
echo "}" >>../srcs.nix
rm -f ../srcs.csv
cd ..

17
pkgs/development/libraries/kde-frameworks-5.16/frameworkintegration.nix Normal file
View file

@ -0,0 +1,17 @@
{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
, kwidgetsaddons, libXcursor, qtx11extras
}:
kdeFramework {
name = "frameworkintegration";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kbookmarks kcompletion kconfig knotifications kwidgetsaddons
libXcursor
];
propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

22
pkgs/development/libraries/kde-frameworks-5.16/kactivities.nix Normal file
View file

@ -0,0 +1,22 @@
{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative
}:
kdeFramework {
name = "kactivities";
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [
boost kcmutils kconfig kcoreaddons kdbusaddons kservice
kxmlgui
];
propagatedBuildInputs = [
kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
];
postInstall = ''
wrapQtProgram "$out/bin/kactivitymanagerd"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

12
pkgs/development/libraries/kde-frameworks-5.16/kapidox.nix Normal file
View file

@ -0,0 +1,12 @@
{ kdeFramework, lib
, extra-cmake-modules
, python
}:
kdeFramework {
name = "kapidox";
nativeBuildInputs = [ extra-cmake-modules python ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

11
pkgs/development/libraries/kde-frameworks-5.16/karchive.nix Normal file
View file

@ -0,0 +1,11 @@
{ kdeFramework, lib
, extra-cmake-modules
}:
kdeFramework {
name = "karchive";
nativeBuildInputs = [ extra-cmake-modules ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

16
pkgs/development/libraries/kde-frameworks-5.16/kauth/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ kdeFramework, lib
, extra-cmake-modules
, kcoreaddons
, polkitQt
}:
kdeFramework {
name = "kauth";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ polkitQt ];
propagatedBuildInputs = [ kcoreaddons ];
patches = [ ./kauth-policy-install.patch ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

13
pkgs/development/libraries/kde-frameworks-5.16/kauth/kauth-policy-install.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
index e859ec7..9a8ab18 100644
--- a/KF5AuthConfig.cmake.in
+++ b/KF5AuthConfig.cmake.in
@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")

25
pkgs/development/libraries/kde-frameworks-5.16/kbookmarks.nix Normal file
View file

@ -0,0 +1,25 @@
{ kdeFramework, lib
, extra-cmake-modules
, kcodecs
, kconfig
, kconfigwidgets
, kcoreaddons
, kiconthemes
, kxmlgui
}:
kdeFramework {
name = "kbookmarks";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcodecs
kconfig
kconfigwidgets
kcoreaddons
kiconthemes
kxmlgui
];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

25
pkgs/development/libraries/kde-frameworks-5.16/kcmutils/0001-qdiriterator-follow-symlinks.patch Normal file
View file

@ -0,0 +1,25 @@
From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 06:43:53 -0500
Subject: [PATCH] qdiriterator follow symlinks
---
src/kpluginselector.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
index 9c3431d..d6b1ee2 100644
--- a/src/kpluginselector.cpp
+++ b/src/kpluginselector.cpp
@@ -305,7 +305,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());
}
--
2.5.2

17
pkgs/development/libraries/kde-frameworks-5.16/kcmutils/default.nix Normal file
View file

@ -0,0 +1,17 @@
{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
, kpackage, kservice, kxmlgui
}:
kdeFramework {
name = "kcmutils";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcoreaddons kiconthemes kitemviews kpackage kxmlgui
];
propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

11
pkgs/development/libraries/kde-frameworks-5.16/kcodecs.nix Normal file
View file

@ -0,0 +1,11 @@
{ kdeFramework, lib
, extra-cmake-modules
}:
kdeFramework {
name = "kcodecs";
nativeBuildInputs = [ extra-cmake-modules ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

14
pkgs/development/libraries/kde-frameworks-5.16/kcompletion.nix Normal file
View file

@ -0,0 +1,14 @@
{ kdeFramework, lib
, extra-cmake-modules
, kconfig
, kwidgetsaddons
}:
kdeFramework {
name = "kcompletion";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kconfig kwidgetsaddons ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

16
pkgs/development/libraries/kde-frameworks-5.16/kconfig.nix Normal file
View file

@ -0,0 +1,16 @@
{ kdeFramework, lib
, extra-cmake-modules
, makeQtWrapper
}:
kdeFramework {
name = "kconfig";
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
postInstall = ''
wrapQtProgram "$out/bin/kreadconfig5"
wrapQtProgram "$out/bin/kwriteconfig5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

25
pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch Normal file
View file

@ -0,0 +1,25 @@
From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 06:47:01 -0500
Subject: [PATCH] qdiriterator follow symlinks
---
src/khelpclient.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
--
2.5.2

17
pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/default.nix Normal file
View file

@ -0,0 +1,17 @@
{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
}:
kdeFramework {
name = "kconfigwidgets";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [ kguiaddons ];
propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
postInstall = ''
wrapQtProgram "$out/bin/preparetips5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

13
pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix Normal file
View file

@ -0,0 +1,13 @@
{ kdeFramework, lib
, extra-cmake-modules
, shared_mime_info
}:
kdeFramework {
name = "kcoreaddons";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ shared_mime_info ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

16
pkgs/development/libraries/kde-frameworks-5.16/kcrash.nix Normal file
View file

@ -0,0 +1,16 @@
{ kdeFramework, lib
, extra-cmake-modules
, kcoreaddons
, kwindowsystem
, qtx11extras
}:
kdeFramework {
name = "kcrash";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons ];
propagatedBuildInputs = [ kwindowsystem qtx11extras ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

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