kde5: Frameworks 5.17, Plasma 5.5.1, Applications 15.12.0
The stable `kde5` attribute is updated to these versions. The old versions have been removed.
This commit is contained in:
Thomas Tuegel
parent
61176d8987
commit
0a81a0d8ff
@ -1,58 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
# Maintainer's Notes:
|
||||
#
|
||||
# Minor updates:
|
||||
# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
|
||||
# releases updates that include only the changed packages; in this case,
|
||||
# multiple URLs can be provided and the results will be merged.
|
||||
# 2. Run ./manifest.sh and ./dependencies.sh.
|
||||
# 3. Build and enjoy.
|
||||
#
|
||||
# Major updates:
|
||||
# We prefer not to immediately overwrite older versions with major updates, so
|
||||
# make a copy of this directory first. After copying, be sure to delete ./tmp
|
||||
# if it exists. Then follow the minor update instructions.
|
||||
|
||||
{ pkgs, 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; {
|
||||
kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; };
|
||||
|
||||
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 {};
|
||||
ksnapshot = callPackage ./ksnapshot.nix {};
|
||||
libkdcraw = callPackage ./libkdcraw.nix {};
|
||||
libkexiv2 = callPackage ./libkexiv2.nix {};
|
||||
libkipi = callPackage ./libkipi.nix {};
|
||||
okular = callPackage ./okular.nix {};
|
||||
oxygen-icons = callPackage ./oxygen-icons.nix {};
|
||||
print-manager = callPackage ./print-manager.nix {};
|
||||
|
||||
l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
|
||||
};
|
||||
|
||||
newScope = scope: pkgs.kf515.newScope ({ inherit kdeApp; } // scope);
|
||||
|
||||
in lib.makeScope newScope packages
|
||||
@ -1,31 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,70 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
#! /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/stable/applications/15.08.3/ http://download.kde.org/stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz -A *.tar.xz'
|
||||
|
||||
mkdir tmp; cd tmp
|
||||
|
||||
rm -f ../srcs.csv
|
||||
|
||||
wget -nH -r -c --no-parent $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 ..
|
||||
@ -1,27 +0,0 @@
|
||||
{ kdeApp
|
||||
, lib
|
||||
, automoc4
|
||||
, cmake
|
||||
, perl
|
||||
, pkgconfig
|
||||
, kdelibs
|
||||
, ffmpeg
|
||||
}:
|
||||
|
||||
kdeApp {
|
||||
name = "ffmpegthumbs";
|
||||
nativeBuildInputs = [
|
||||
automoc4
|
||||
cmake
|
||||
perl
|
||||
pkgconfig
|
||||
];
|
||||
buildInputs = [
|
||||
kdelibs
|
||||
ffmpeg
|
||||
];
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2 bsd3 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,44 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,69 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
{ 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 {});
|
||||
})
|
||||
@ -1,20 +0,0 @@
|
||||
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 ""}
|
||||
'';
|
||||
})
|
||||
@ -1,17 +0,0 @@
|
||||
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 ""}
|
||||
'';
|
||||
})
|
||||
@ -1,29 +0,0 @@
|
||||
{ kdeApp
|
||||
, lib
|
||||
, automoc4
|
||||
, cmake
|
||||
, perl
|
||||
, pkgconfig
|
||||
, kdelibs
|
||||
, libkexiv2
|
||||
, libkdcraw
|
||||
}:
|
||||
|
||||
kdeApp {
|
||||
name = "kdegraphics-thumbnailers";
|
||||
nativeBuildInputs = [
|
||||
automoc4
|
||||
cmake
|
||||
perl
|
||||
pkgconfig
|
||||
];
|
||||
buildInputs = [
|
||||
kdelibs
|
||||
libkexiv2
|
||||
libkdcraw
|
||||
];
|
||||
meta = {
|
||||
license = [ lib.licenses.lgpl21 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 7 Sep 2015 13:54:57 -0500
|
||||
Subject: [PATCH 1/2] old kde4 cmake policies
|
||||
|
||||
---
|
||||
cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++
|
||||
1 file changed, 33 insertions(+)
|
||||
|
||||
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
|
||||
index 7d54b9b..c435571 100644
|
||||
--- a/cmake/modules/FindKDE4Internal.cmake
|
||||
+++ b/cmake/modules/FindKDE4Internal.cmake
|
||||
@@ -345,6 +345,39 @@
|
||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
+# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below
|
||||
+cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
|
||||
+# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3)
|
||||
+cmake_policy(VERSION 2.4.5)
|
||||
+
|
||||
+# CMake 2.6, set compatibility behaviour to cmake 2.4
|
||||
+# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above
|
||||
+# resets the policy settings, so we get a lot of warnings
|
||||
+
|
||||
+# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough
|
||||
+cmake_policy(SET CMP0000 OLD)
|
||||
+# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests
|
||||
+cmake_policy(SET CMP0002 OLD)
|
||||
+# CMP0003: add the link paths to the link command as with cmake 2.4
|
||||
+cmake_policy(SET CMP0003 OLD)
|
||||
+# CMP0005: keep escaping behaviour for definitions added via add_definitions()
|
||||
+cmake_policy(SET CMP0005 OLD)
|
||||
+# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file
|
||||
+# where this is done, macros and functions are executed with the policies as they
|
||||
+# were when the were defined. Keep the OLD behaviour so we can set the policies here
|
||||
+# for all KDE software without the big warning
|
||||
+cmake_policy(SET CMP0011 OLD)
|
||||
+
|
||||
+# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files
|
||||
+# in this directory over those from CMAKE_MODULE_PATH
|
||||
+cmake_policy(SET CMP0017 NEW)
|
||||
+
|
||||
+# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake
|
||||
+if (POLICY CMP0026)
|
||||
+ cmake_policy(SET CMP0026 OLD)
|
||||
+endif (POLICY CMP0026)
|
||||
+
|
||||
+
|
||||
# Only do something if it hasn't been found yet
|
||||
if(NOT KDE4_FOUND)
|
||||
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 7 Sep 2015 13:56:03 -0500
|
||||
Subject: [PATCH 2/2] polkit install path
|
||||
|
||||
---
|
||||
kdecore/auth/ConfigureChecks.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake
|
||||
index 7cf9cb5..c8334ae 100644
|
||||
--- a/kdecore/auth/ConfigureChecks.cmake
|
||||
+++ b/kdecore/auth/ConfigureChecks.cmake
|
||||
@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
|
||||
${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
|
||||
${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
|
||||
|
||||
- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
|
||||
+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
|
||||
"Where policy files generated by KAuth will be installed" FORCE)
|
||||
elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
|
||||
set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
|
||||
index ab8f76d..2ae5089 100644
|
||||
--- a/kdecore/kernel/kstandarddirs.cpp
|
||||
+++ b/kdecore/kernel/kstandarddirs.cpp
|
||||
@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults()
|
||||
else
|
||||
{
|
||||
xdgdirList.clear();
|
||||
- xdgdirList.append(QString::fromLatin1("/etc/xdg"));
|
||||
-#ifdef Q_WS_WIN
|
||||
- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
|
||||
-#else
|
||||
- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
|
||||
-#endif
|
||||
}
|
||||
|
||||
QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
|
||||
@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults()
|
||||
}
|
||||
} else {
|
||||
xdgdirList = kdedirDataDirs;
|
||||
-#ifndef Q_WS_WIN
|
||||
- xdgdirList.append(QString::fromLatin1("/usr/local/share/"));
|
||||
- xdgdirList.append(QString::fromLatin1("/usr/share/"));
|
||||
-#endif
|
||||
}
|
||||
|
||||
localXdgDir = readEnvPath("XDG_DATA_HOME");
|
||||
diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp
|
||||
index 4c9cad9..6849d45 100644
|
||||
--- a/solid/solid/xdgbasedirs.cpp
|
||||
+++ b/solid/solid/xdgbasedirs.cpp
|
||||
@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource )
|
||||
{
|
||||
if ( qstrncmp( "data", resource, 4 ) == 0 ) {
|
||||
if ( instance()->mDataDirs.isEmpty() ) {
|
||||
- instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" );
|
||||
+ instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" );
|
||||
}
|
||||
return instance()->mDataDirs;
|
||||
} else if ( qstrncmp( "config", resource, 6 ) == 0 ) {
|
||||
if ( instance()->mConfigDirs.isEmpty() ) {
|
||||
- instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" );
|
||||
+ instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" );
|
||||
}
|
||||
return instance()->mConfigDirs;
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
{ kdeApp, attica, attr, automoc4, avahi, bison, cmake
|
||||
, docbook_xml_dtd_42, docbook_xsl, flex, giflib, ilmbase
|
||||
, libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig
|
||||
, polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info
|
||||
, soprano, strigi, udev, xz
|
||||
, lib
|
||||
}:
|
||||
|
||||
kdeApp {
|
||||
name = "kdelibs";
|
||||
|
||||
buildInputs = [
|
||||
attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
|
||||
polkit_qt4 qca2 shared_desktop_ontologies udev xz
|
||||
];
|
||||
propagatedBuildInputs = [ qt4 soprano phonon strigi ];
|
||||
nativeBuildInputs = [
|
||||
automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info
|
||||
];
|
||||
|
||||
patches = [
|
||||
./0001-old-kde4-cmake-policies.patch
|
||||
./0002-polkit-install-path.patch
|
||||
./0003-remove_xdg_impurities.patch
|
||||
];
|
||||
|
||||
# cmake does not detect path to `ilmbase`
|
||||
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
|
||||
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
|
||||
"-DWITH_SOLID_UDISKS2=ON"
|
||||
"-DKDE_DEFAULT_HOME=.kde"
|
||||
];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = {
|
||||
licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
|
||||
--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200
|
||||
+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200
|
||||
@@ -139,7 +139,7 @@
|
||||
${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
|
||||
${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
|
||||
|
||||
- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
|
||||
+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
|
||||
"Where policy files generated by KAuth will be installed" FORCE)
|
||||
elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
|
||||
set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
|
||||
@ -1,10 +0,0 @@
|
||||
addQt4Plugins() {
|
||||
if [[ -d "$1/lib/qt4/plugins" ]]; then
|
||||
propagatedUserEnvPkgs+=" $1"
|
||||
fi
|
||||
|
||||
if [[ -d "$1/lib/kde4/plugins" ]]; then
|
||||
propagatedUserEnvPkgs+=" $1"
|
||||
fi
|
||||
}
|
||||
envHooks+=(addQt4Plugins)
|
||||
@ -1,38 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,68 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,231 +0,0 @@
|
||||
{ callPackage, pkgs, lib }:
|
||||
|
||||
let
|
||||
|
||||
kdeLocale4 = import ./kde-locale-4.nix;
|
||||
kdeLocale5 = import ./kde-locale-5.nix;
|
||||
|
||||
in
|
||||
|
||||
lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
|
||||
ar = {
|
||||
qt4 = callPackage (kdeLocale4 "ar" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "ar" {}) {};
|
||||
};
|
||||
bg = {
|
||||
qt4 = callPackage (kdeLocale4 "bg" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "bg" {}) {};
|
||||
};
|
||||
bs = {
|
||||
qt4 = callPackage (kdeLocale4 "bs" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "bs" {}) {};
|
||||
};
|
||||
ca = {
|
||||
qt4 = callPackage (kdeLocale4 "ca" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "ca" {}) {};
|
||||
};
|
||||
ca_valencia = {
|
||||
qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {};
|
||||
};
|
||||
cs = {
|
||||
qt4 = callPackage (kdeLocale4 "cs" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "cs" {}) {};
|
||||
};
|
||||
da = {
|
||||
qt4 = callPackage (kdeLocale4 "da" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "da" {}) {};
|
||||
};
|
||||
de = {
|
||||
qt4 = callPackage (kdeLocale4 "de" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "de" {}) {};
|
||||
};
|
||||
el = {
|
||||
qt4 = callPackage (kdeLocale4 "el" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "el" {}) {};
|
||||
};
|
||||
en_GB = {
|
||||
qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "en_GB" {}) {};
|
||||
};
|
||||
eo = {
|
||||
qt4 = callPackage (kdeLocale4 "eo" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "eo" {}) {};
|
||||
};
|
||||
es = {
|
||||
qt4 = callPackage (kdeLocale4 "es" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "es" {}) {};
|
||||
};
|
||||
et = {
|
||||
qt4 = callPackage (kdeLocale4 "et" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "et" {}) {};
|
||||
};
|
||||
eu = {
|
||||
qt4 = callPackage (kdeLocale4 "eu" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "eu" {}) {};
|
||||
};
|
||||
fa = {
|
||||
qt4 = callPackage (kdeLocale4 "fa" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "fa" {}) {};
|
||||
};
|
||||
fi = {
|
||||
qt4 = callPackage (kdeLocale4 "fi" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "fi" {}) {};
|
||||
};
|
||||
fr = {
|
||||
qt4 = callPackage (kdeLocale4 "fr" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "fr" {}) {};
|
||||
};
|
||||
ga = {
|
||||
qt4 = callPackage (kdeLocale4 "ga" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "ga" {}) {};
|
||||
};
|
||||
gl = {
|
||||
qt4 = callPackage (kdeLocale4 "gl" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "gl" {}) {};
|
||||
};
|
||||
he = {
|
||||
qt4 = callPackage (kdeLocale4 "he" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "he" {}) {};
|
||||
};
|
||||
hi = {
|
||||
qt4 = callPackage (kdeLocale4 "hi" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "hi" {}) {};
|
||||
};
|
||||
hr = {
|
||||
qt4 = callPackage (kdeLocale4 "hr" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "hr" {}) {};
|
||||
};
|
||||
hu = {
|
||||
qt4 = callPackage (kdeLocale4 "hu" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "hu" {}) {};
|
||||
};
|
||||
ia = {
|
||||
qt4 = callPackage (kdeLocale4 "ia" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "ia" {}) {};
|
||||
};
|
||||
id = {
|
||||
qt4 = callPackage (kdeLocale4 "id" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "id" {}) {};
|
||||
};
|
||||
is = {
|
||||
qt4 = callPackage (kdeLocale4 "is" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "is" {}) {};
|
||||
};
|
||||
it = {
|
||||
qt4 = callPackage (kdeLocale4 "it" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "it" {}) {};
|
||||
};
|
||||
ja = {
|
||||
qt4 = callPackage (kdeLocale4 "ja" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "ja" {}) {};
|
||||
};
|
||||
kk = {
|
||||
qt4 = callPackage (kdeLocale4 "kk" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "kk" {}) {};
|
||||
};
|
||||
km = {
|
||||
qt4 = callPackage (kdeLocale4 "km" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "km" {}) {};
|
||||
};
|
||||
ko = {
|
||||
qt4 = callPackage (kdeLocale4 "ko" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "ko" {}) {};
|
||||
};
|
||||
lt = {
|
||||
qt4 = callPackage (kdeLocale4 "lt" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "lt" {}) {};
|
||||
};
|
||||
lv = {
|
||||
qt4 = callPackage (kdeLocale4 "lv" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "lv" {}) {};
|
||||
};
|
||||
mr = {
|
||||
qt4 = callPackage (kdeLocale4 "mr" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "mr" {}) {};
|
||||
};
|
||||
nb = {
|
||||
qt4 = callPackage (kdeLocale4 "nb" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "nb" {}) {};
|
||||
};
|
||||
nds = {
|
||||
qt4 = callPackage (kdeLocale4 "nds" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "nds" {}) {};
|
||||
};
|
||||
nl = {
|
||||
qt4 = callPackage (kdeLocale4 "nl" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "nl" {}) {};
|
||||
};
|
||||
nn = {
|
||||
qt4 = callPackage (kdeLocale4 "nn" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "nn" {}) {};
|
||||
};
|
||||
pa = {
|
||||
qt4 = callPackage (kdeLocale4 "pa" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "pa" {}) {};
|
||||
};
|
||||
pl = {
|
||||
qt4 = callPackage (kdeLocale4 "pl" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "pl" {}) {};
|
||||
};
|
||||
pt = {
|
||||
qt4 = callPackage (kdeLocale4 "pt" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "pt" {}) {};
|
||||
};
|
||||
pt_BR = {
|
||||
qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "pt_BR" {}) {};
|
||||
};
|
||||
ro = {
|
||||
qt4 = callPackage (kdeLocale4 "ro" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "ro" {}) {};
|
||||
};
|
||||
ru = {
|
||||
qt4 = callPackage (kdeLocale4 "ru" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "ru" {}) {};
|
||||
};
|
||||
sk = {
|
||||
qt4 = callPackage (kdeLocale4 "sk" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "sk" {}) {};
|
||||
};
|
||||
sl = {
|
||||
qt4 = callPackage (kdeLocale4 "sl" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "sl" {}) {};
|
||||
};
|
||||
sr = {
|
||||
qt4 = callPackage (kdeLocale4 "sr" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "sr" {
|
||||
preConfigure = ''
|
||||
sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
|
||||
'';
|
||||
}) {};
|
||||
};
|
||||
sv = {
|
||||
qt4 = callPackage (kdeLocale4 "sv" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "sv" {}) {};
|
||||
};
|
||||
tr = {
|
||||
qt4 = callPackage (kdeLocale4 "tr" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "tr" {}) {};
|
||||
};
|
||||
ug = {
|
||||
qt4 = callPackage (kdeLocale4 "ug" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "ug" {}) {};
|
||||
};
|
||||
uk = {
|
||||
qt4 = callPackage (kdeLocale4 "uk" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "uk" {}) {};
|
||||
};
|
||||
wa = {
|
||||
qt4 = callPackage (kdeLocale4 "wa" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "wa" {}) {};
|
||||
};
|
||||
zh_CN = {
|
||||
qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "zh_CN" {}) {};
|
||||
};
|
||||
zh_TW = {
|
||||
qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
|
||||
qt5 = callPackage (kdeLocale5 "zh_TW" {}) {};
|
||||
};
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
{ kdeApp
|
||||
, lib
|
||||
, automoc4
|
||||
, cmake
|
||||
, perl
|
||||
, pkgconfig
|
||||
, libraw
|
||||
, kdelibs
|
||||
}:
|
||||
|
||||
kdeApp {
|
||||
name = "libkdcraw";
|
||||
nativeBuildInputs = [
|
||||
automoc4
|
||||
cmake
|
||||
perl
|
||||
pkgconfig
|
||||
];
|
||||
buildInputs = [
|
||||
kdelibs
|
||||
libraw
|
||||
];
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
{ kdeApp
|
||||
, lib
|
||||
, automoc4
|
||||
, cmake
|
||||
, perl
|
||||
, pkgconfig
|
||||
, exiv2
|
||||
, kdelibs
|
||||
}:
|
||||
|
||||
kdeApp {
|
||||
name = "libkexiv2";
|
||||
nativeBuildInputs = [
|
||||
automoc4
|
||||
cmake
|
||||
perl
|
||||
pkgconfig
|
||||
];
|
||||
buildInputs = [
|
||||
exiv2
|
||||
kdelibs
|
||||
];
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
{ kdeApp
|
||||
, lib
|
||||
, automoc4
|
||||
, cmake
|
||||
, perl
|
||||
, pkgconfig
|
||||
, kdelibs
|
||||
}:
|
||||
|
||||
kdeApp {
|
||||
name = "libkipi";
|
||||
nativeBuildInputs = [
|
||||
automoc4
|
||||
cmake
|
||||
perl
|
||||
pkgconfig
|
||||
];
|
||||
buildInputs = [
|
||||
kdelibs
|
||||
];
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,41 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeApp
|
||||
, lib
|
||||
, cmake
|
||||
}:
|
||||
|
||||
kdeApp {
|
||||
name = "oxygen-icons";
|
||||
nativeBuildInputs = [ cmake ];
|
||||
meta = {
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,23 +0,0 @@
|
||||
{ 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"
|
||||
'';
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
{ 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"
|
||||
];
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
{ plasmaPackage, extra-cmake-modules, frameworkintegration
|
||||
, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons
|
||||
, ki18n, kwindowsystem, makeQtWrapper, qtx11extras
|
||||
}:
|
||||
|
||||
plasmaPackage {
|
||||
name = "breeze-qt5";
|
||||
sname = "breeze";
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
makeQtWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
|
||||
];
|
||||
propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
|
||||
cmakeFlags = [ "-DUSE_Qt4=OFF" ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/breeze-settings5"
|
||||
'';
|
||||
}
|
||||
@ -1,86 +0,0 @@
|
||||
# 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;
|
||||
|
||||
kf5 = pkgs.kf514;
|
||||
kdeApps = pkgs.kdeApps_15_08;
|
||||
|
||||
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 {};
|
||||
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 {};
|
||||
oxygen-fonts = callPackage ./oxygen-fonts.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
|
||||
@ -1,57 +0,0 @@
|
||||
#! /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/stable/plasma/5.4.3/"
|
||||
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 ..
|
||||
@ -1,27 +0,0 @@
|
||||
{ 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"
|
||||
'';
|
||||
}
|
||||
@ -1,39 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
{ 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"
|
||||
];
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
{ plasmaPackage, extra-cmake-modules }:
|
||||
|
||||
plasmaPackage {
|
||||
name = "kdecoration";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
{ 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
|
||||
];
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
plasmaPackage {
|
||||
name = "kgamma5";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
propagatedBuildInputs = [ kdelibs4support qtx11extras ];
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
{ 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"
|
||||
'';
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{ 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
|
||||
];
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
{ 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"
|
||||
'';
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
{ 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"
|
||||
'';
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
{ 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 ];
|
||||
propagatedUserEnvPkgs = [
|
||||
libkscreen # D-Bus service
|
||||
];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kscreen-console"
|
||||
'';
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ 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"
|
||||
'';
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
{ 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"
|
||||
wrapQtProgram "$out/bin/ksysguard"
|
||||
'';
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
{ plasmaPackage
|
||||
, extra-cmake-modules
|
||||
, wayland
|
||||
}:
|
||||
|
||||
plasmaPackage {
|
||||
name = "kwayland";
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
];
|
||||
buildInputs = [
|
||||
wayland
|
||||
];
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
{ plasmaPackage, extra-cmake-modules, kdoctools, epoxy
|
||||
, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets
|
||||
, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel
|
||||
, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications
|
||||
, kpackage, kservice, kwayland, kwidgetsaddons, kwindowsystem
|
||||
, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative
|
||||
, qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor
|
||||
, makeQtWrapper
|
||||
}:
|
||||
|
||||
plasmaPackage {
|
||||
name = "kwin";
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
kdoctools
|
||||
makeQtWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
|
||||
kcrash kdecoration kiconthemes kinit knewstuff knotifications
|
||||
kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE
|
||||
libSM qtscript udev wayland xcb-util-cursor
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kactivities kdeclarative kglobalaccel ki18n kio kwindowsystem
|
||||
plasma-framework qtdeclarative qtmultimedia qtx11extras
|
||||
];
|
||||
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kwin_x11"
|
||||
wrapQtProgram "$out/bin/kwin_wayland"
|
||||
'';
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty
|
||||
, knotifications, kdbusaddons
|
||||
}:
|
||||
|
||||
plasmaPackage {
|
||||
name = "kwrited";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ];
|
||||
propagatedBuildInputs = [ ki18n ];
|
||||
}
|
||||
@ -1,18 +0,0 @@
|
||||
{ plasmaPackage
|
||||
, extra-cmake-modules
|
||||
, libXrandr
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
plasmaPackage {
|
||||
name = "libkscreen";
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
];
|
||||
buildInputs = [
|
||||
libXrandr
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
qtx11extras
|
||||
];
|
||||
}
|
||||
@ -1,130 +0,0 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 460022f..422a708 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -1,5 +1,7 @@
|
||||
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
|
||||
|
||||
+configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h)
|
||||
+
|
||||
set(libkscreen_SRCS
|
||||
backendloader.cpp
|
||||
config.cpp
|
||||
diff --git a/src/backendloader.cpp b/src/backendloader.cpp
|
||||
index b93e469..8aebc14 100644
|
||||
--- a/src/backendloader.cpp
|
||||
+++ b/src/backendloader.cpp
|
||||
@@ -16,6 +16,7 @@
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
|
||||
*************************************************************************************/
|
||||
|
||||
+#include "config-libkscreen.h"
|
||||
#include "backendloader.h"
|
||||
#include "debug_p.h"
|
||||
#include "backends/abstractbackend.h"
|
||||
@@ -40,55 +41,54 @@ bool BackendLoader::init()
|
||||
const QString backend = qgetenv("KSCREEN_BACKEND").constData();
|
||||
const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend);
|
||||
|
||||
- const QStringList paths = QCoreApplication::libraryPaths();
|
||||
- Q_FOREACH (const QString &path, paths) {
|
||||
- const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
|
||||
- backendFilter,
|
||||
- QDir::SortFlags(QDir::QDir::NoSort),
|
||||
- QDir::NoDotAndDotDot | QDir::Files);
|
||||
- const QFileInfoList finfos = dir.entryInfoList();
|
||||
- Q_FOREACH (const QFileInfo &finfo, finfos) {
|
||||
- // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
|
||||
- if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
|
||||
- continue;
|
||||
- }
|
||||
+ QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/");
|
||||
|
||||
- // When on X11, skip the QScreen backend, instead use the XRandR backend,
|
||||
- // if not specified in KSCREEN_BACKEND
|
||||
- if (backend.isEmpty() &&
|
||||
- finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
|
||||
- QX11Info::isPlatformX11()) {
|
||||
- continue;
|
||||
- }
|
||||
+ const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
|
||||
+ backendFilter,
|
||||
+ QDir::SortFlags(QDir::QDir::NoSort),
|
||||
+ QDir::NoDotAndDotDot | QDir::Files);
|
||||
+ const QFileInfoList finfos = dir.entryInfoList();
|
||||
+ Q_FOREACH (const QFileInfo &finfo, finfos) {
|
||||
+ // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
|
||||
+ if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
|
||||
+ continue;
|
||||
+ }
|
||||
|
||||
- // When not on X11, skip the XRandR backend, and fall back to QSCreen
|
||||
- // if not specified in KSCREEN_BACKEND
|
||||
- if (backend.isEmpty() &&
|
||||
- finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
|
||||
- !QX11Info::isPlatformX11()) {
|
||||
- continue;
|
||||
- }
|
||||
+ // When on X11, skip the QScreen backend, instead use the XRandR backend,
|
||||
+ // if not specified in KSCREEN_BACKEND
|
||||
+ if (backend.isEmpty() &&
|
||||
+ finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
|
||||
+ QX11Info::isPlatformX11()) {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ // When not on X11, skip the XRandR backend, and fall back to QSCreen
|
||||
+ // if not specified in KSCREEN_BACKEND
|
||||
+ if (backend.isEmpty() &&
|
||||
+ finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
|
||||
+ !QX11Info::isPlatformX11()) {
|
||||
+ continue;
|
||||
+ }
|
||||
|
||||
- QPluginLoader loader(finfo.filePath());
|
||||
- loader.load();
|
||||
- QObject *instance = loader.instance();
|
||||
- if (!instance) {
|
||||
+ QPluginLoader loader(finfo.filePath());
|
||||
+ loader.load();
|
||||
+ QObject *instance = loader.instance();
|
||||
+ if (!instance) {
|
||||
+ loader.unload();
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ s_backend = qobject_cast< AbstractBackend* >(instance);
|
||||
+ if (s_backend) {
|
||||
+ if (!s_backend->isValid()) {
|
||||
+ qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
|
||||
+ delete s_backend;
|
||||
+ s_backend = 0;
|
||||
loader.unload();
|
||||
continue;
|
||||
}
|
||||
-
|
||||
- s_backend = qobject_cast< AbstractBackend* >(instance);
|
||||
- if (s_backend) {
|
||||
- if (!s_backend->isValid()) {
|
||||
- qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
|
||||
- delete s_backend;
|
||||
- s_backend = 0;
|
||||
- loader.unload();
|
||||
- continue;
|
||||
- }
|
||||
- qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
|
||||
- return true;
|
||||
- }
|
||||
+ qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
|
||||
+ return true;
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake
|
||||
new file mode 100644
|
||||
index 0000000..a99f3d1
|
||||
--- /dev/null
|
||||
+++ b/src/config-libkscreen.h.cmake
|
||||
@@ -0,0 +1,2 @@
|
||||
+#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
|
||||
+#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}"
|
||||
@ -1,25 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
{ 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
|
||||
];
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
{ 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
|
||||
];
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
{ plasmaPackage
|
||||
, extra-cmake-modules
|
||||
, fontforge
|
||||
}:
|
||||
|
||||
plasmaPackage {
|
||||
name = "oxygen-fonts";
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
fontforge
|
||||
];
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
{ 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"
|
||||
'';
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
From 618d86f35b83ee9e57da12be9d0866e34e487b88 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Fri, 28 Aug 2015 10:16:38 -0500
|
||||
Subject: [PATCH 1/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 cec5ab8..fc4a6b9 100644
|
||||
--- a/kcms/dateandtime/helper.cpp
|
||||
+++ b/kcms/dateandtime/helper.cpp
|
||||
@@ -48,10 +48,6 @@
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
-// We cannot rely on the $PATH environment variable, because D-Bus activation
|
||||
-// clears it. So we have to use a reasonable default.
|
||||
-static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin");
|
||||
-
|
||||
int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
|
||||
{
|
||||
int ret = 0;
|
||||
@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
|
||||
|
||||
void ClockHelper::toHwclock()
|
||||
{
|
||||
- QString hwclock = KStandardDirs::findExe("hwclock", exePath);
|
||||
+ QString hwclock = "@hwclock@";
|
||||
if (!hwclock.isEmpty()) {
|
||||
KProcess::execute(hwclock, QStringList() << "--systohc");
|
||||
}
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From decdc77a7e89b6f1bb3d49268b08a43daf4a7147 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Fri, 28 Aug 2015 10:16:53 -0500
|
||||
Subject: [PATCH 2/3] zoneinfo
|
||||
|
||||
---
|
||||
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 fc4a6b9..7b64d05 100644
|
||||
--- a/kcms/dateandtime/helper.cpp
|
||||
+++ b/kcms/dateandtime/helper.cpp
|
||||
@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
|
||||
|
||||
val = selectedzone;
|
||||
#else
|
||||
- QString tz = "/usr/share/zoneinfo/" + selectedzone;
|
||||
+ // NixOS-specific path
|
||||
+ QString tz = "/etc/zoneinfo/" + selectedzone;
|
||||
+ if (!QFile::exists(tz)) {
|
||||
+ // Standard Linux path
|
||||
+ tz = "/usr/share/zoneinfo/" + selectedzone;
|
||||
+ }
|
||||
|
||||
if (QFile::exists(tz)) { // make sure the new TZ really exists
|
||||
QFile::remove("/etc/localtime");
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
From 4231d70ec08d9bbb367b222d9ef04454c1dc7328 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 19 Oct 2015 18:45:36 -0500
|
||||
Subject: [PATCH 3/3] qt-5.5 QML import paths
|
||||
|
||||
---
|
||||
applets/pager/package/contents/ui/main.qml | 2 +-
|
||||
containments/desktop/package/contents/ui/FolderView.qml | 2 +-
|
||||
containments/desktop/package/contents/ui/main.qml | 2 +-
|
||||
containments/panel/contents/ui/main.qml | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml
|
||||
index 0c367c6..c9a82be 100644
|
||||
--- a/applets/pager/package/contents/ui/main.qml
|
||||
+++ b/applets/pager/package/contents/ui/main.qml
|
||||
@@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
|
||||
import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents
|
||||
import org.kde.draganddrop 2.0
|
||||
import org.kde.plasma.private.pager 2.0
|
||||
-import "utils.js" as Utils
|
||||
+import "../code/utils.js" as Utils
|
||||
|
||||
MouseArea {
|
||||
id: root
|
||||
diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
|
||||
index 578ec87..04e088c 100644
|
||||
--- a/containments/desktop/package/contents/ui/FolderView.qml
|
||||
+++ b/containments/desktop/package/contents/ui/FolderView.qml
|
||||
@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
|
||||
import org.kde.kquickcontrolsaddons 2.0
|
||||
|
||||
import org.kde.private.desktopcontainment.folder 0.1 as Folder
|
||||
-import "FolderTools.js" as FolderTools
|
||||
+import "../code/FolderTools.js" as FolderTools
|
||||
|
||||
Item {
|
||||
id: main
|
||||
diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml
|
||||
index 8c42706..fc74433 100644
|
||||
--- a/containments/desktop/package/contents/ui/main.qml
|
||||
+++ b/containments/desktop/package/contents/ui/main.qml
|
||||
@@ -28,7 +28,7 @@ import org.kde.draganddrop 2.0 as DragDrop
|
||||
|
||||
import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
|
||||
|
||||
-import "LayoutManager.js" as LayoutManager
|
||||
+import "../code/LayoutManager.js" as LayoutManager
|
||||
|
||||
DragDrop.DropArea {
|
||||
id: root
|
||||
diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
|
||||
index 6a6f364..edba48e 100644
|
||||
--- a/containments/panel/contents/ui/main.qml
|
||||
+++ b/containments/panel/contents/ui/main.qml
|
||||
@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
|
||||
import org.kde.kquickcontrolsaddons 2.0
|
||||
import org.kde.draganddrop 2.0 as DragDrop
|
||||
|
||||
-import "LayoutManager.js" as LayoutManager
|
||||
+import "../code/LayoutManager.js" as LayoutManager
|
||||
|
||||
DragDrop.DropArea {
|
||||
id: root
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
{ 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 = [
|
||||
(substituteAll {
|
||||
src = ./0001-hwclock.patch;
|
||||
hwclock = "${utillinux}/sbin/hwclock";
|
||||
})
|
||||
./0002-zoneinfo.patch
|
||||
./0003-qt-5.5-QML-import-paths.patch
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ];
|
||||
cmakeFlags = [
|
||||
"-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"
|
||||
'';
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
{ 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;
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
|
||||
, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
|
||||
, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
|
||||
, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
|
||||
, kxmlgui, makeQtWrapper, mobile_broadband_provider_info
|
||||
, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
|
||||
, qtdeclarative, solid
|
||||
}:
|
||||
|
||||
plasmaPackage {
|
||||
name = "plasma-nm";
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./0001-mobile-broadband-provider-info-path.patch;
|
||||
inherit mobile_broadband_provider_info;
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
kdoctools
|
||||
makeQtWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
|
||||
kinit kitemviews knotifications kservice kwallet kwidgetsaddons
|
||||
kxmlgui mobile_broadband_provider_info modemmanager-qt
|
||||
networkmanager-qt openconnect solid
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
|
||||
qtdeclarative
|
||||
];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kde5-nm-connection-editor"
|
||||
'';
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
{ plasmaPackage, extra-cmake-modules, glib, kconfigwidgets
|
||||
, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio
|
||||
, plasma-framework
|
||||
}:
|
||||
|
||||
plasmaPackage {
|
||||
name = "plasma-pa";
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
];
|
||||
buildInputs = [
|
||||
glib kconfigwidgets kcoreaddons libpulseaudio
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kdeclarative kglobalaccel ki18n plasma-framework
|
||||
];
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
{ plasmaPackage
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
plasmaPackage {
|
||||
name = "plasma-workspace-wallpapers";
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
];
|
||||
}
|
||||
@ -1,401 +0,0 @@
|
||||
From 35efc2ce92ed698abb21a79aa6e6670e844ea776 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Thu, 27 Aug 2015 20:36:39 -0500
|
||||
Subject: [PATCH 1/2] startkde NixOS patches
|
||||
|
||||
---
|
||||
startkde/startkde.cmake | 217 ++++++++++++++++++++----------------------------
|
||||
1 file changed, 88 insertions(+), 129 deletions(-)
|
||||
|
||||
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
|
||||
index 2c4c315..7733721 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,53 +106,19 @@ 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="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@"
|
||||
-
|
||||
-if [ ! $install_share = $usr_share ]; then
|
||||
-
|
||||
- if [ ${XDG_DATA_HOME} ]; then
|
||||
- fontsDir="${XDG_DATA_HOME}/fonts"
|
||||
- else
|
||||
- fontsDir="${HOME}/.fonts"
|
||||
- fi
|
||||
-
|
||||
- test -d $fontsDir || {
|
||||
- mkdir -p $fontsDir
|
||||
- }
|
||||
-
|
||||
- oxygenDir=$fontsDir/oxygen
|
||||
- prefixDir="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@/fonts/oxygen"
|
||||
-
|
||||
- # if the oxygen dir doesn't exist, create a symlink to be sure that the
|
||||
- # Oxygen font is available to the user
|
||||
- test -d $oxygenDir || test -d $prefixDir && {
|
||||
- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
|
||||
- }
|
||||
-fi
|
||||
-
|
||||
-kstartupconfig5
|
||||
+@out@/bin/kstartupconfig5
|
||||
returncode=$?
|
||||
if test $returncode -ne 0; then
|
||||
- xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
|
||||
+ @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
|
||||
exit 1
|
||||
fi
|
||||
[ -r $configDir/startupconfig ] && . $configDir/startupconfig
|
||||
|
||||
-if test "$kdeglobals_kscreen_scalefactor" -ne 1; then
|
||||
- export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
|
||||
-fi
|
||||
+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @coreutils@/bin/tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | @coreutils@/bin/tr "\n" ":")
|
||||
+export XCURSOR_PATH
|
||||
|
||||
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
|
||||
if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
|
||||
- @EXPORT_XCURSOR_PATH@
|
||||
|
||||
kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
|
||||
if test $? -eq 10; then
|
||||
@@ -163,21 +134,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 +189,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 +219,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 +232,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,30 +251,6 @@ fi
|
||||
|
||||
echo 'startkde: Starting up...' 1>&2
|
||||
|
||||
-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
|
||||
-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
|
||||
-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
|
||||
-# /usr/local.
|
||||
-if test -z "$XDG_DATA_DIRS"; then
|
||||
- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
|
||||
-fi
|
||||
-export XDG_DATA_DIRS
|
||||
-
|
||||
-# Make sure that D-Bus is running
|
||||
-# D-Bus autolaunch is broken
|
||||
-if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
|
||||
- eval `dbus-launch --sh-syntax --exit-with-session`
|
||||
-fi
|
||||
-if $qdbus >/dev/null 2>/dev/null; then
|
||||
- : # ok
|
||||
-else
|
||||
- echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
|
||||
- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
||||
- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-
|
||||
# Mark that full KDE session is running (e.g. Konqueror preloading works only
|
||||
# with full KDE running). The KDE_FULL_SESSION property can be detected by
|
||||
# any X client connected to the same X session, even if not launched
|
||||
@@ -321,11 +275,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
|
||||
@@ -335,11 +289,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 +302,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 +337,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
|
||||
# lock now and do the rest of the KDE startup underneath the locker.
|
||||
KSMSERVEROPTIONS=""
|
||||
test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
|
||||
-kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
|
||||
+@kinit@/bin/kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
|
||||
if test $? -eq 255; then
|
||||
# Startup error
|
||||
echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2
|
||||
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
||||
- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
|
||||
+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
|
||||
fi
|
||||
|
||||
-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
|
||||
+wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
|
||||
|
||||
if test x"$wait_drkonqi"x = x"true"x ; then
|
||||
# wait for remaining drkonqi instances with timeout (in seconds)
|
||||
- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
|
||||
+ wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
|
||||
wait_drkonqi_counter=0
|
||||
- while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
||||
+ while @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 +369,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.2
|
||||
|
||||
@ -1,123 +0,0 @@
|
||||
From 033d3560d26ceabbd6da6310d326fec7a473df82 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 19 Oct 2015 18:55:36 -0500
|
||||
Subject: [PATCH 2/2] qt-5.5 QML import paths
|
||||
|
||||
---
|
||||
applets/analog-clock/contents/ui/analogclock.qml | 2 +-
|
||||
applets/batterymonitor/package/contents/ui/BatteryItem.qml | 2 +-
|
||||
applets/batterymonitor/package/contents/ui/CompactRepresentation.qml | 2 +-
|
||||
applets/batterymonitor/package/contents/ui/PopupDialog.qml | 2 +-
|
||||
applets/batterymonitor/package/contents/ui/batterymonitor.qml | 2 +-
|
||||
applets/lock_logout/contents/ui/lockout.qml | 2 +-
|
||||
applets/notifications/package/contents/ui/main.qml | 2 +-
|
||||
applets/systemtray/package/contents/ui/main.qml | 2 +-
|
||||
8 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/applets/analog-clock/contents/ui/analogclock.qml b/applets/analog-clock/contents/ui/analogclock.qml
|
||||
index edb3af9..7eb839d 100644
|
||||
--- a/applets/analog-clock/contents/ui/analogclock.qml
|
||||
+++ b/applets/analog-clock/contents/ui/analogclock.qml
|
||||
@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as PlasmaCalendar
|
||||
import QtQuick.Layouts 1.1
|
||||
|
||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||
-import "logic.js" as Logic
|
||||
+import "../code/logic.js" as Logic
|
||||
|
||||
Item {
|
||||
id: analogclock
|
||||
diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
|
||||
index 8d43797..3322369 100644
|
||||
--- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml
|
||||
+++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
|
||||
@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
|
||||
import org.kde.plasma.extras 2.0 as PlasmaExtras
|
||||
import org.kde.plasma.workspace.components 2.0
|
||||
import org.kde.kcoreaddons 1.0 as KCoreAddons
|
||||
-import "logic.js" as Logic
|
||||
+import "../code/logic.js" as Logic
|
||||
|
||||
Item {
|
||||
id: batteryItem
|
||||
diff --git a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
|
||||
index b4059cb..ae8eeaf 100755
|
||||
--- a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
|
||||
+++ b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
|
||||
@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1
|
||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||
import org.kde.plasma.components 2.0 as Components
|
||||
import org.kde.plasma.workspace.components 2.0
|
||||
-import "logic.js" as Logic
|
||||
+import "../code/logic.js" as Logic
|
||||
|
||||
MouseArea {
|
||||
id: root
|
||||
diff --git a/applets/batterymonitor/package/contents/ui/PopupDialog.qml b/applets/batterymonitor/package/contents/ui/PopupDialog.qml
|
||||
index d4952c6..2b6586d 100644
|
||||
--- a/applets/batterymonitor/package/contents/ui/PopupDialog.qml
|
||||
+++ b/applets/batterymonitor/package/contents/ui/PopupDialog.qml
|
||||
@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
|
||||
import org.kde.plasma.components 2.0 as Components
|
||||
import org.kde.plasma.extras 2.0 as PlasmaExtras
|
||||
import org.kde.kquickcontrolsaddons 2.0
|
||||
-import "logic.js" as Logic
|
||||
+import "../code/logic.js" as Logic
|
||||
|
||||
FocusScope {
|
||||
id: dialog
|
||||
diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
|
||||
index a086581..6e1e8be 100755
|
||||
--- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml
|
||||
+++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
|
||||
@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
|
||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||
import org.kde.kcoreaddons 1.0 as KCoreAddons
|
||||
import org.kde.kquickcontrolsaddons 2.0
|
||||
-import "logic.js" as Logic
|
||||
+import "../code/logic.js" as Logic
|
||||
|
||||
Item {
|
||||
id: batterymonitor
|
||||
diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml
|
||||
index d243796..86475df 100644
|
||||
--- a/applets/lock_logout/contents/ui/lockout.qml
|
||||
+++ b/applets/lock_logout/contents/ui/lockout.qml
|
||||
@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
|
||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||
import org.kde.plasma.components 2.0
|
||||
import org.kde.kquickcontrolsaddons 2.0
|
||||
-import "data.js" as Data
|
||||
+import "../code/data.js" as Data
|
||||
|
||||
Flow {
|
||||
id: lockout
|
||||
diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml
|
||||
index 2871cdb..3f50856 100644
|
||||
--- a/applets/notifications/package/contents/ui/main.qml
|
||||
+++ b/applets/notifications/package/contents/ui/main.qml
|
||||
@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
|
||||
|
||||
import org.kde.plasma.private.notifications 1.0
|
||||
|
||||
-import "uiproperties.js" as UiProperties
|
||||
+import "../code/uiproperties.js" as UiProperties
|
||||
|
||||
MouseEventListener {
|
||||
id: notificationsApplet
|
||||
diff --git a/applets/systemtray/package/contents/ui/main.qml b/applets/systemtray/package/contents/ui/main.qml
|
||||
index 2e26455..864c9c5 100644
|
||||
--- a/applets/systemtray/package/contents/ui/main.qml
|
||||
+++ b/applets/systemtray/package/contents/ui/main.qml
|
||||
@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
|
||||
// import org.kde.plasma.extras 2.0 as PlasmaExtras
|
||||
|
||||
import org.kde.private.systemtray 2.0 as SystemTray
|
||||
-import "Layout.js" as LayoutManager
|
||||
+import "../code/Layout.js" as LayoutManager
|
||||
|
||||
Item {
|
||||
id: root
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
{ 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-startkde-NixOS-patches.patch
|
||||
./0002-qt-5.5-QML-import-paths.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"
|
||||
wrapQtProgram "$out/lib/libexec/kscreenlocker_greet"
|
||||
rm "$out/lib/libexec/startplasma"
|
||||
'';
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
{ 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 ];
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities
|
||||
, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
|
||||
, kidletime, kio, knotifyconfig, 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
|
||||
libkscreen plasma-workspace qtx11extras
|
||||
];
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
addToSearchPath XDG_DATA_DIRS @out@/share
|
||||
@ -1,301 +0,0 @@
|
||||
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
|
||||
{ fetchurl, mirror }:
|
||||
|
||||
{
|
||||
bluedevil = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/bluedevil-5.4.3.tar.xz";
|
||||
sha256 = "04zl8sl59imxfmph8igy2xw5qbdqhqbf1f3s92zhrcqghnawyr3k";
|
||||
name = "bluedevil-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/breeze-5.4.3.tar.xz";
|
||||
sha256 = "1ylkrza65m4irvyfl3nzfsfaf3j0z3q5j5qv7lk16g4crknxb2gw";
|
||||
name = "breeze-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-cli-tools = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kde-cli-tools-5.4.3.tar.xz";
|
||||
sha256 = "16d7fkxvbr60h96g7faq6c7gzssb43ynac7yhpfp4i2gwx1w9q8r";
|
||||
name = "kde-cli-tools-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kdecoration = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kdecoration-5.4.3.tar.xz";
|
||||
sha256 = "1m92spmq0gadcwgwhnf163kh3kzccgw2b62px1v5krk8hlw6q19q";
|
||||
name = "kdecoration-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-gtk-config = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kde-gtk-config-5.4.3.tar.xz";
|
||||
sha256 = "0apfvcmwzp5g02kx0dvkywrfb7v9gbmlnmyga2jra027zf61jf98";
|
||||
name = "kde-gtk-config-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeplasma-addons = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kdeplasma-addons-5.4.3.tar.xz";
|
||||
sha256 = "0wyqwrlhm9k2wscbw372mk2v7207jappq59jhzxx223glvz2qrxp";
|
||||
name = "kdeplasma-addons-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kgamma5 = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kgamma5-5.4.3.tar.xz";
|
||||
sha256 = "0l6bk008w8m3wiqvk4pdw9s7iln9fbkbi5xl3b8rf846knr478gr";
|
||||
name = "kgamma5-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
khelpcenter = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/khelpcenter-5.4.3.tar.xz";
|
||||
sha256 = "0kf68maqcm2ym62d6r7v6sw9v91qxzdg53l0hk9h6p7sycs0jqq2";
|
||||
name = "khelpcenter-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
khotkeys = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/khotkeys-5.4.3.tar.xz";
|
||||
sha256 = "094nsrmnja83rim1cxa5p4rfxx4bdwwsv6b04rvg0l55jvw9wp29";
|
||||
name = "khotkeys-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kinfocenter = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kinfocenter-5.4.3.tar.xz";
|
||||
sha256 = "1v6y1div8fhyn93ypnz3a7q6d1mzyabav2bq4rn5rg5hldizjns7";
|
||||
name = "kinfocenter-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kmenuedit = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kmenuedit-5.4.3.tar.xz";
|
||||
sha256 = "0zpwvg0xw04jg5kxv9kdmlf6pg1yp6ibzafl8q3ah8ca5n92gb9n";
|
||||
name = "kmenuedit-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreen = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kscreen-5.4.3.tar.xz";
|
||||
sha256 = "01ba4qqf5vlmsgpf3raq7dgwxvdcm4inc7v03b3z4l7980wa6nxr";
|
||||
name = "kscreen-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
ksshaskpass = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/ksshaskpass-5.4.3.tar.xz";
|
||||
sha256 = "18r7a49i0rlijjz02h2k2wri3bkhjvzl5as0nv55gkg8b1g05dky";
|
||||
name = "ksshaskpass-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
ksysguard = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/ksysguard-5.4.3.tar.xz";
|
||||
sha256 = "1lgbvabxfzyl9x1nsmr6nifh24jxnvlknigfrzfcnryibbvk6mlk";
|
||||
name = "ksysguard-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet-pam = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kwallet-pam-5.4.3.tar.xz";
|
||||
sha256 = "0m5yz8c6alaw0rkc0dd9cp7jijqmpdmqg4qbc3i3pp5rz3hiyp51";
|
||||
name = "kwallet-pam-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kwayland-5.4.3.tar.xz";
|
||||
sha256 = "026jgwyvkfb3zdrama2fi046zxg7v3khvb6sxl1krj4idiiyz1c0";
|
||||
name = "kwayland-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland-integration = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kwayland-integration-5.4.3.tar.xz";
|
||||
sha256 = "10acnrv7m12gwd0mccp9j9a47sjl29xrrfwlpqiqh9hcw4vn7mqp";
|
||||
name = "kwayland-integration-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwin = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kwin-5.4.3.tar.xz";
|
||||
sha256 = "0rn359b31hpwqarsw3018r1j7vaavwwxpnnhy29ixsdybmrl4j5b";
|
||||
name = "kwin-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwrited = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/kwrited-5.4.3.tar.xz";
|
||||
sha256 = "0irnhvsz6zssq3yb7lf0qy0qimydg78y1ghakpmry8632xgmr0yk";
|
||||
name = "kwrited-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
libkscreen = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/libkscreen-5.4.3.tar.xz";
|
||||
sha256 = "0xa9g6kvvxn2q3fv0217dk3j4dgbd0mhy8hgrvblpp0fw721faqx";
|
||||
name = "libkscreen-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
libksysguard = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/libksysguard-5.4.3.tar.xz";
|
||||
sha256 = "18fndkj2bzbwrbixrsq27x4ar379vlsplr3nw766maw31nv5in6i";
|
||||
name = "libksysguard-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
milou = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/milou-5.4.3.tar.xz";
|
||||
sha256 = "0xy6h1h1ws47rqx5hcn3916xwf49nywwmq32161jap233347yj71";
|
||||
name = "milou-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
muon = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/muon-5.4.3.tar.xz";
|
||||
sha256 = "011l36ayl0xhap5d7cmkbf4vki8516r594dhxdpfm0ma0rnz4xrl";
|
||||
name = "muon-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/oxygen-5.4.3.tar.xz";
|
||||
sha256 = "1av665s2gq84y925qqfhc5bi7wm17vm7p4n10kigsnn5ywylh405";
|
||||
name = "oxygen-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen-fonts = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz";
|
||||
sha256 = "13430yajk1i2l9lz95ry9xc1fvzpvfvdp6m9jikb2g55x606abx0";
|
||||
name = "oxygen-fonts-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-desktop = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/plasma-desktop-5.4.3.tar.xz";
|
||||
sha256 = "0hy08ip6cvcz2s3w1wkqjxdydmmfj5mcqv85qbawsrkix0d79694";
|
||||
name = "plasma-desktop-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-mediacenter = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/plasma-mediacenter-5.4.3.tar.xz";
|
||||
sha256 = "0k85h93yxqf9ccw620r8wk38gzd8nmpmaxsvwx2rssgnn35f04va";
|
||||
name = "plasma-mediacenter-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-nm = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/plasma-nm-5.4.3.tar.xz";
|
||||
sha256 = "1wlhzhn7sz26b0ibvwrxbp4pwajvnpj6m37md9bdls3872yhql5r";
|
||||
name = "plasma-nm-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-pa = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/plasma-pa-5.4.3.tar.xz";
|
||||
sha256 = "16ydbvvpwrnh0ik005gdpvmbn38a1k0bn8zvas1gwjz86rkayxr6";
|
||||
name = "plasma-pa-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-sdk = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/plasma-sdk-5.4.3.tar.xz";
|
||||
sha256 = "08d31g0364ifc5yix0617zhjyv1skrc9m6x38mx0jjk1z2ng9db8";
|
||||
name = "plasma-sdk-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/plasma-workspace-5.4.3.tar.xz";
|
||||
sha256 = "030xqy1s8j3h03arjc39xhw2xs9h2c328id6qgaqxk8v9qimkr5z";
|
||||
name = "plasma-workspace-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace-wallpapers = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/plasma-workspace-wallpapers-5.4.3.tar.xz";
|
||||
sha256 = "12yb9d2b7ynfkmmcc4ciz8cnx482vn9545qrijaa403ba0jfbrhx";
|
||||
name = "plasma-workspace-wallpapers-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
polkit-kde-agent = {
|
||||
version = "1-5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/polkit-kde-agent-1-5.4.3.tar.xz";
|
||||
sha256 = "1309wmdrxfqlv621kagwycn2s41n9zsyb56ysqmyilhnb7wq59yn";
|
||||
name = "polkit-kde-agent-1-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
powerdevil = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/powerdevil-5.4.3.tar.xz";
|
||||
sha256 = "1j20xgca41hqacgsridsigw7s275ad3j0khb59875722qz1y91a0";
|
||||
name = "powerdevil-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
sddm-kcm = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/sddm-kcm-5.4.3.tar.xz";
|
||||
sha256 = "1ppryl541pjwxi73q1qdcd23kmhga3ajj0j6fws6y8ag4mpg2b6k";
|
||||
name = "sddm-kcm-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
systemsettings = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/systemsettings-5.4.3.tar.xz";
|
||||
sha256 = "04p455rfxlsp817dqgg907szyfsd0f6ym5kaqaj2g7ys5v8id1vb";
|
||||
name = "systemsettings-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
user-manager = {
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.4.3/user-manager-5.4.3.tar.xz";
|
||||
sha256 = "0vnfh5q8fgjs40frsb709r7d0py1xgr40air3zysasw25g4bjca8";
|
||||
name = "user-manager-5.4.3.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
{ 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"
|
||||
'';
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "attica";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,112 +0,0 @@
|
||||
# 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 {};
|
||||
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
|
||||
@ -1,74 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
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)
|
||||
@ -1,57 +0,0 @@
|
||||
#! /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.15/"
|
||||
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 ..
|
||||
@ -1,17 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, python
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kapidox";
|
||||
nativeBuildInputs = [ extra-cmake-modules python ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "karchive";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
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@")
|
||||
@ -1,25 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kcodecs";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, kconfig
|
||||
, kwidgetsaddons
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kcompletion";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ kconfig kwidgetsaddons ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
{ 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 ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, shared_mime_info
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kcoreaddons";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ shared_mime_info ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user