Merge branch 'kde4'
This commit is contained in:
Thomas Tuegel
commit
2d6566bb85
|
|
@ -281,10 +281,10 @@ let
|
|||
buildInputs = super.kremotecontrol.buildInputs ++ [xlibs.libXtst];
|
||||
};
|
||||
|
||||
krfb = with pkgs; super.krfb // {
|
||||
krfb = super.krfb // {
|
||||
buildInputs =
|
||||
super.krfb.buildInputs
|
||||
++ [xlibs.libXtst kde4.telepathy.common_internals];
|
||||
++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals];
|
||||
};
|
||||
|
||||
libkdcraw = with pkgs; super.libkdcraw // {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, kdelibs, gettext }:
|
||||
{ stdenv, fetchurl, kdelibs, gettext, konsole }:
|
||||
|
||||
let
|
||||
pname = "yakuake";
|
||||
|
|
@ -16,6 +16,10 @@ stdenv.mkDerivation {
|
|||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace app/terminal.cpp --replace \"konsolepart\" "\"${konsole}/lib/kde4/libkonsolepart.so\""
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://yakuake.kde.org;
|
||||
description = "Quad-style terminal emulator for KDE";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3" }:
|
||||
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3", kdelibs }:
|
||||
|
||||
let
|
||||
branch = "4.14";
|
||||
|
|
@ -27,6 +27,8 @@ kde.modules // kde.individual //
|
|||
{
|
||||
inherit (kde) manifest modules individual splittedModuleList;
|
||||
|
||||
inherit kdelibs;
|
||||
|
||||
akonadi = callPackage ./support/akonadi { };
|
||||
|
||||
qt4 = qt48;
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ hashes=builtins.listToAttrs[
|
|||
{name="kdegraphics-mobipocket";value="0m41s8scy5hym6mk0kfmjj54dc3yxahsdrliaadixhp0fx02cx0v";}
|
||||
{name="kdegraphics-strigi-analyzer";value="08d2vrghwqkw4mg4vmgsynfnhygxpavxnscvs3z70hdff7i001f0";}
|
||||
{name="kdegraphics-thumbnailers";value="1lhb7m298mbz7dk50savqdz3p6lkbscn0gi6bqapji24464vlb8k";}
|
||||
{name="kdelibs";value="17pxihhcbinr3jpwvi1iwfnqs2wiqh0jgf1is05yz13122hns87q";}
|
||||
{name="kdenetwork-filesharing";value="0a8vw6jj0kz0lq96mj3mfzpdvb6xpw8xvccwxhjqp164bzqdz66d";}
|
||||
{name="kdenetwork-strigi-analyzers";value="14px6ddp8flqd40bww0sl71jmn5bfqm9j3v6rqm63ii7z87qk6xl";}
|
||||
{name="kdepim";value="0i7r68r5nzflmpdkkzpj5xc3fwxg5903g1fj5g1yn79v5zx1gzd3";}
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
{ kde, gcc, cmake, perl
|
||||
, qt4, bzip2, fam, shared_mime_info, giflib, jasper, strigi
|
||||
, openexr, avahi, kerberos, shared_desktop_ontologies, libXScrnSaver
|
||||
, automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
|
||||
, docbook_xml_dtd_42, docbook_xsl, polkit_qt4, acl, attr, libXtst
|
||||
, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt
|
||||
, pkgconfig
|
||||
}:
|
||||
|
||||
kde {
|
||||
|
||||
# TODO: media-player-info
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq
|
||||
libdbusmenu_qt libXScrnSaver polkit_qt4 qca2 acl jasper libxslt
|
||||
shared_desktop_ontologies xz udev libjpeg kerberos openexr
|
||||
libXtst attr
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
|
||||
|
||||
propagatedBuildInputs = [ qt4 soprano phonon strigi ];
|
||||
|
||||
propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
|
||||
|
||||
# TODO: make sonnet plugins (dictionaries) really work.
|
||||
# There are a few hardcoded paths.
|
||||
# Split plugins from libs?
|
||||
|
||||
patches = [
|
||||
../files/polkit-install.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
|
||||
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
|
||||
"-DHUPNP_ENABLED=ON"
|
||||
"-DWITH_SOLID_UDISKS2=ON"
|
||||
];
|
||||
|
||||
passthru.wantsUdisks2 = true;
|
||||
|
||||
meta = {
|
||||
description = "KDE libraries";
|
||||
license = "LGPL";
|
||||
};
|
||||
}
|
||||
|
|
@ -132,6 +132,10 @@ let
|
|||
plasma-workspace = with pkgs; super.plasma-workspace // {
|
||||
buildInputs = with xlibs;
|
||||
super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ];
|
||||
postPatch = ''
|
||||
substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
|
||||
--replace kdostartupconfig5 $out/bin/kdostartupconfig5
|
||||
'';
|
||||
postInstall = ''
|
||||
# We use a custom startkde script
|
||||
rm $out/bin/startkde
|
||||
|
|
|
|||
|
|
@ -63,15 +63,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
|
||||
# This is the default
|
||||
# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
||||
configDir=${HOME}/.config;
|
||||
fi
|
||||
|
||||
mkdir -p $configDir
|
||||
configDir=$(@qt5@/bin/qtpaths --writable-path GenericConfigLocation)
|
||||
mkdir -p "$configDir"
|
||||
|
||||
# This is basically setting defaults so we can use them with kstartupconfig5
|
||||
cat @startupconfigkeys@ >$configDir/startupconfigkeys
|
||||
|
|
@ -177,8 +170,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=`@qt5@/bin/qtpaths --paths ConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g'`
|
||||
scriptpath=$(@qt5@/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
|
||||
|
|
|
|||
|
|
@ -5726,7 +5726,7 @@ let
|
|||
|
||||
giblib = callPackage ../development/libraries/giblib { };
|
||||
|
||||
libgit2 = callPackage ../development/libraries/git2 { };
|
||||
libgit2 = callPackage ../development/libraries/git2 { cmake = cmake-3_2; };
|
||||
|
||||
glew = callPackage ../development/libraries/glew { };
|
||||
|
||||
|
|
@ -10830,6 +10830,10 @@ let
|
|||
kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
|
||||
kf5 = kf57;
|
||||
qt5 = qt54;
|
||||
pkgs = pkgs // {
|
||||
cmake = cmake-3_2;
|
||||
};
|
||||
kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
|
||||
});
|
||||
kdeApps_stable = kdeApps_14_12;
|
||||
kdeApps_latest = kdeApps_14_12;
|
||||
|
|
@ -12829,6 +12833,7 @@ let
|
|||
callPackage = newScope (self // { cmake = cmake-3_2; });
|
||||
kde4 = callPackageOrig dir {
|
||||
inherit callPackage callPackageOrig;
|
||||
kdelibs = kdeApps_stable.kdelibs;
|
||||
};
|
||||
in kde4 // {
|
||||
inherit kde4;
|
||||
|
|
|
|||
Loading…
Reference in New Issue