uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
48
pkgs/desktops/plasma-5/plasma-desktop/default.nix
Normal file
48
pkgs/desktops/plasma-5/plasma-desktop/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
|
||||
boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio,
|
||||
libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
|
||||
xorgserver, util-linux,
|
||||
|
||||
accounts-qt, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg,
|
||||
qtx11extras,
|
||||
|
||||
attica, baloo, kaccounts-integration, kactivities, kactivities-stats, kauth,
|
||||
kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
|
||||
kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
|
||||
kpeople, krunner, kscreenlocker, kwallet, kwin, phonon,
|
||||
plasma-framework, plasma-workspace, qqc2-desktop-style, xf86inputlibinput
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "plasma-desktop";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver
|
||||
libxkbfile phonon xf86inputlibinput xf86inputevdev xf86inputsynaptics xinput
|
||||
xkeyboard_config
|
||||
|
||||
accounts-qt qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras
|
||||
|
||||
attica baloo kaccounts-integration kactivities kactivities-stats kauth
|
||||
kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons
|
||||
kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig
|
||||
kpeople krunner kscreenlocker kwallet kwin plasma-framework
|
||||
plasma-workspace qqc2-desktop-style
|
||||
];
|
||||
|
||||
patches = [
|
||||
./hwclock-path.patch
|
||||
./tzdir.patch
|
||||
];
|
||||
CXXFLAGS = [
|
||||
''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"''
|
||||
];
|
||||
postInstall = ''
|
||||
# Display ~/Desktop contents on the desktop by default.
|
||||
sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \
|
||||
-e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/'
|
||||
'';
|
||||
}
|
||||
24
pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
Normal file
24
pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
|
||||
===================================================================
|
||||
--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
|
||||
+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
|
||||
@@ -48,10 +48,6 @@
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
-// We cannot rely on the $PATH environment variable, because D-Bus activation
|
||||
-// clears it. So we have to use a reasonable default.
|
||||
-static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin");
|
||||
-
|
||||
int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled)
|
||||
{
|
||||
int ret = 0;
|
||||
@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
|
||||
|
||||
void ClockHelper::toHwclock()
|
||||
{
|
||||
- QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':')));
|
||||
+ QString hwclock = QLatin1String(NIXPKGS_HWCLOCK);
|
||||
if (!hwclock.isEmpty()) {
|
||||
KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));
|
||||
}
|
||||
18
pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
Normal file
18
pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
|
||||
===================================================================
|
||||
--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
|
||||
+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
|
||||
@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& sele
|
||||
|
||||
val = selectedzone;
|
||||
#else
|
||||
- QString tz = "/usr/share/zoneinfo/" + selectedzone;
|
||||
+ QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR"));
|
||||
+ QString tz = tzdir + "/" + selectedzone;
|
||||
+ if (tzdir.isEmpty()) {
|
||||
+ // Standard Linux path
|
||||
+ tz = "/usr/share/zoneinfo/" + selectedzone;
|
||||
+ }
|
||||
|
||||
if (QFile::exists(tz)) { // make sure the new TZ really exists
|
||||
QFile::remove(QStringLiteral("/etc/localtime"));
|
||||
Loading…
Add table
Add a link
Reference in a new issue