Merge branch 'kde-5' into staging

This commit is contained in:
Thomas Tuegel 2016-04-25 19:04:43 -05:00
commit dc062f2c8e
221 changed files with 3197 additions and 3446 deletions

View file

@ -114,7 +114,7 @@ in {
# Ugly hack for using the correct gnome3 packageSet
basePackages = mkOption {
type = types.attrsOf types.package;
default = { inherit networkmanager modemmanager wpa_supplicant
default = { inherit networkmanager.out modemmanager wpa_supplicant
networkmanager_openvpn networkmanager_vpnc
networkmanager_openconnect
networkmanager_pptp networkmanager_l2tp; };

View file

@ -102,6 +102,15 @@ in
pkgs.hicolor_icon_theme
kde5.kde-gtk-config
pkgs.phonon-backend-gstreamer
pkgs.kde5.phonon-backend-gstreamer
pkgs.gst_all_1.gstreamer
pkgs.gst_all_1.gst-plugins-base
pkgs.gst_all_1.gst-plugins-good
pkgs.gst_all_1.gst-plugins-ugly
pkgs.gst_all_1.gst-plugins-bad
pkgs.gst_all_1.gst-libav # for mp3 playback
]
# Plasma 5.5 and later has a Breeze GTK theme.
@ -111,25 +120,16 @@ in
# Install Breeze icons if available
++ lib.optional (lib.hasAttr "breeze-icons" kde5) kde5.breeze-icons
# Install activity manager if available
++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd
# Optional hardware support features
++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil
++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa
++ lib.optional config.powerManagement.enable kde5.powerdevil
++ lib.optional config.services.colord.enable kde5.colord-kde
++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ]
++ lib.optionals cfg.phonon.gstreamer.enable
[
pkgs.phonon-backend-gstreamer
pkgs.kde5.phonon-backend-gstreamer
pkgs.gst_all_1.gstreamer
pkgs.gst_all_1.gst-plugins-base
pkgs.gst_all_1.gst-plugins-good
pkgs.gst_all_1.gst-plugins-ugly
pkgs.gst_all_1.gst-plugins-bad
pkgs.gst_all_1.gst-libav # for mp3 playback
];
++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ];
environment.pathsToLink = [ "/share" ];
@ -138,12 +138,9 @@ in
target = "X11/xkb";
};
environment.profileRelativeEnvVars =
mkIf cfg.phonon.gstreamer.enable
{
GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
};
environment.profileRelativeEnvVars = {
GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
};
# Enable GTK applications to load SVG icons
environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) {

File diff suppressed because it is too large Load diff

View file

@ -4,7 +4,7 @@
set -x
# The trailing slash at the end is necessary!
WGET_ARGS='http://download.kde.org/stable/applications/15.12.3/ -A *.tar.xz'
WGET_ARGS='http://download.kde.org/stable/applications/16.04.0/ -A *.tar.xz'
mkdir tmp; cd tmp

View file

@ -1,15 +1,16 @@
{ kdeApp, lib
, automoc4, cmake, kdelibs
, extra-cmake-modules
, ki18n, kwidgetsaddons, kxmlgui
}:
kdeApp {
name = "kcolorchooser";
nativeBuildInputs = [ automoc4 cmake ];
buildInputs = [ kdelibs ];
meta = {
license = with lib.licenses; [ mit ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ki18n kwidgetsaddons kxmlgui ];
}

View file

@ -2,7 +2,7 @@
, extra-cmake-modules, kdoctools
, shared_mime_info
, exiv2
, karchive
, kactivities, karchive
, kbookmarks
, kconfig, kconfigwidgets
, kcoreaddons, kdbusaddons, kguiaddons
@ -15,7 +15,7 @@
, kpty
, libmtp
, libssh
, openexr
, openexr, ilmbase
, openslp
, phonon
, qtsvg
@ -25,34 +25,18 @@
kdeApp {
name = "kio-extras";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [
extra-cmake-modules kdoctools
shared_mime_info
];
buildInputs = [
exiv2
karchive
kbookmarks
kconfig kconfigwidgets
kcoreaddons kdbusaddons kguiaddons
kdnssd
kiconthemes
ki18n
kio
khtml
kdelibs4support
kpty
libmtp
libssh
openexr
openslp
phonon
qtsvg
samba
solid
exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
kpty libmtp libssh openexr openslp phonon qtsvg samba solid
];
meta = {
license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev or ilmbase}/include/OpenEXR" ];
}

View file

@ -5,6 +5,7 @@
, kconfig
, kcoreaddons
, kdbusaddons
, kdeclarative
, ki18n
, kio
, knotifications
@ -19,23 +20,11 @@
kdeApp {
name = "spectacle";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
extra-cmake-modules kdoctools makeQtWrapper
];
buildInputs = [
kconfig
kcoreaddons
kdbusaddons
ki18n
kio
knotifications
kscreen
kwidgetsaddons
kwindowsystem
kxmlgui
libkipi
xcb-util-cursor
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
];
postFixup = ''
wrapQtProgram "$out/bin/spectacle"

File diff suppressed because it is too large Load diff

View file

@ -1,31 +0,0 @@
Index: kinit-5.19.0/src/kdeinit/kinit.cpp
===================================================================
--- kinit-5.19.0.orig/src/kdeinit/kinit.cpp
+++ kinit-5.19.0/src/kdeinit/kinit.cpp
@@ -658,15 +658,17 @@ static pid_t launch(int argc, const char
if (!libpath.isEmpty()) {
if (!l.load()) {
if (libpath_relative) {
- // NB: Because Qt makes the actual dlopen() call, the
- // RUNPATH of kdeinit is *not* respected - see
- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945
- // - so we try hacking it in ourselves
- QString install_lib_dir = QFile::decodeName(
- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
- libpath = install_lib_dir + libpath;
- l.setFileName(libpath);
- l.load();
+ // Try to load the library relative to the active profiles.
+ QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
+ // Reverse the profile list.
+ std::reverse(profiles.begin(), profiles.end());
+ const QString libdir = QString::fromLatin1("/lib/");
+ Q_FOREACH (const QByteArray &profile, profiles) {
+ if (!profile.isEmpty()) {
+ l.setFileName(QFile::decodeName(profile) + libdir + libpath);
+ if (l.load()) break;
+ }
+ }
}
}
if (!l.isLoaded()) {

View file

@ -1,565 +0,0 @@
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
{ fetchurl, mirror }:
{
attica = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/attica-5.19.0.tar.xz";
sha256 = "0cbvjnv2fcqsxspiy5pzmnnzrpfamlsc9j927kd6gpzai1ckf1lv";
name = "attica-5.19.0.tar.xz";
};
};
baloo = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/baloo-5.19.0.tar.xz";
sha256 = "02yy0w13h5wxm74a87zi439f6yd9miid6rb54nia0pgvcka98svg";
name = "baloo-5.19.0.tar.xz";
};
};
bluez-qt = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/bluez-qt-5.19.0.tar.xz";
sha256 = "0609i7rzhnnnp4fqnwscwp6y646ji8kl2hw5sy7azc87yllisnyv";
name = "bluez-qt-5.19.0.tar.xz";
};
};
breeze-icons = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/breeze-icons-5.19.0.tar.xz";
sha256 = "0bwix0jl1dscqfb7ygn9drpd9ivfx4g15vz6h01mswvxa9lz1vj0";
name = "breeze-icons-5.19.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/extra-cmake-modules-5.19.0.tar.xz";
sha256 = "1dl3hhbara7iswb5wsc5dp17ar3ljw5f0nrncl8vry9smaz2zl63";
name = "extra-cmake-modules-5.19.0.tar.xz";
};
};
frameworkintegration = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/frameworkintegration-5.19.0.tar.xz";
sha256 = "00la7p7wcyqpxyi73h4fjrmm9d2gqzdaljn4468xya4bfns5ijy3";
name = "frameworkintegration-5.19.0.tar.xz";
};
};
kactivities = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kactivities-5.19.0.tar.xz";
sha256 = "0yml1sbn3z4jd4vsfs25kqrl03pmlcgamzbgpw3248sabhyg7ks3";
name = "kactivities-5.19.0.tar.xz";
};
};
kapidox = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kapidox-5.19.0.tar.xz";
sha256 = "0a9731xrkd6mnqh72592rx6gfnxxdfd7xl8pdpgdn7qs3394k1yz";
name = "kapidox-5.19.0.tar.xz";
};
};
karchive = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/karchive-5.19.0.tar.xz";
sha256 = "043spmi7s2d1bj8d3wbgzbhisip6h92kqjhlvg8gyv0a7vy54ymv";
name = "karchive-5.19.0.tar.xz";
};
};
kauth = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kauth-5.19.0.tar.xz";
sha256 = "0fm9ih2hkh2rpmlf98yw8z1r5bn2qmpva2k7mrv6ijd5h767fxss";
name = "kauth-5.19.0.tar.xz";
};
};
kbookmarks = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kbookmarks-5.19.0.tar.xz";
sha256 = "0q418jpdc348nqgdavsmxxka4g8sldpdi9n89i1pllfmq10kw9sd";
name = "kbookmarks-5.19.0.tar.xz";
};
};
kcmutils = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kcmutils-5.19.0.tar.xz";
sha256 = "0qhdjb3zvqq9ycfgb52lz4flgipyplj5ksz8h8y71bbs4w6lazd8";
name = "kcmutils-5.19.0.tar.xz";
};
};
kcodecs = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kcodecs-5.19.0.tar.xz";
sha256 = "1rzp314fv9n5168j7nhv1c8fjaszpmgdx6javrx4w0hyrjdfkg66";
name = "kcodecs-5.19.0.tar.xz";
};
};
kcompletion = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kcompletion-5.19.0.tar.xz";
sha256 = "05n0y5kf3bcc4wgn6k0js5cravv1k93xxzrgapm21323qgvfagwd";
name = "kcompletion-5.19.0.tar.xz";
};
};
kconfig = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kconfig-5.19.0.tar.xz";
sha256 = "0nk5hfl8yh0kgaa7xi0cc05dl6nf7prvbvxv0i99207xh9dafdmm";
name = "kconfig-5.19.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kconfigwidgets-5.19.0.tar.xz";
sha256 = "1nld27chcjwjgwv76s2j77ifmca235yp10bm08rjmvnfn6778ypv";
name = "kconfigwidgets-5.19.0.tar.xz";
};
};
kcoreaddons = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kcoreaddons-5.19.0.tar.xz";
sha256 = "07sm0givfdx28p302fkynzsd3xkpn1hbs43d4rscyx18yxfsldcw";
name = "kcoreaddons-5.19.0.tar.xz";
};
};
kcrash = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kcrash-5.19.0.tar.xz";
sha256 = "1dy03gp1sj96wn0zfa0dpbvz8pz0ia1j7p1wcif3iqk55pjxdgyl";
name = "kcrash-5.19.0.tar.xz";
};
};
kdbusaddons = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kdbusaddons-5.19.0.tar.xz";
sha256 = "1bb5aik0kl3kab5399drfjxrm8iysgkf813xgr0y4k64c9kwfp28";
name = "kdbusaddons-5.19.0.tar.xz";
};
};
kdeclarative = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kdeclarative-5.19.0.tar.xz";
sha256 = "03g02zy7wjzmpvqzxx32z8ap7jyj9sf432g1d3csb0dcbx2ny52g";
name = "kdeclarative-5.19.0.tar.xz";
};
};
kded = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kded-5.19.0.tar.xz";
sha256 = "0nyvg0h2aqy7qr57bad6wyc2rmcv9nhdq0py4fxc3irb6516p9hz";
name = "kded-5.19.0.tar.xz";
};
};
kdelibs4support = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/portingAids/kdelibs4support-5.19.0.tar.xz";
sha256 = "0iqnb2j6gfy8006arwv65vljfhxdnk6aia0zppngb481jnd9n2pn";
name = "kdelibs4support-5.19.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kdesignerplugin-5.19.0.tar.xz";
sha256 = "11inmvyair796rx4842naf1dnxqvc6bqqzrv700ycvisad646ws5";
name = "kdesignerplugin-5.19.0.tar.xz";
};
};
kdesu = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kdesu-5.19.0.tar.xz";
sha256 = "19w8m7ji61bpd368lzkwlizcwa1l968l568lksgm2mm9pnyjjhgz";
name = "kdesu-5.19.0.tar.xz";
};
};
kdewebkit = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kdewebkit-5.19.0.tar.xz";
sha256 = "04b5qanhxggffnvmi28lspyi8kj4kq7mxhxndar9fmkzzgvy70hj";
name = "kdewebkit-5.19.0.tar.xz";
};
};
kdnssd = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kdnssd-5.19.0.tar.xz";
sha256 = "15a8w2i29mrbhadw6y123mr0cc45ijabnwdfp3lbkd40lk8nq314";
name = "kdnssd-5.19.0.tar.xz";
};
};
kdoctools = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kdoctools-5.19.0.tar.xz";
sha256 = "06g77n9wxpiv4skc1kz794ppfb2mkmd3fgn6an5kr301xc76cnpn";
name = "kdoctools-5.19.0.tar.xz";
};
};
kemoticons = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kemoticons-5.19.0.tar.xz";
sha256 = "0fiix2sf2wrvmrpx8whdr1bzm7gbv7pvg02y47w5bl6s9gh176g5";
name = "kemoticons-5.19.0.tar.xz";
};
};
kfilemetadata = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kfilemetadata-5.19.0.tar.xz";
sha256 = "11j8if3xhp3xxwibwm6nxb4lh8wx40ni3zf5hki327pxv4vpq3qr";
name = "kfilemetadata-5.19.0.tar.xz";
};
};
kglobalaccel = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kglobalaccel-5.19.0.tar.xz";
sha256 = "021j98f7217m83aqxpamg0lzlaiskdaqsd9iabc8wrp1g0nkm05d";
name = "kglobalaccel-5.19.0.tar.xz";
};
};
kguiaddons = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kguiaddons-5.19.0.tar.xz";
sha256 = "019xaf7vpgifcw8wibli9d2b50brhgdaypsqknh6mqq8q9g06jhy";
name = "kguiaddons-5.19.0.tar.xz";
};
};
khtml = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/portingAids/khtml-5.19.0.tar.xz";
sha256 = "0hqa54a9nxy954vy8gf52y89xd3ibz9b4jgh6w347b1alp1zn145";
name = "khtml-5.19.0.tar.xz";
};
};
ki18n = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/ki18n-5.19.0.tar.xz";
sha256 = "0v3arc20y5d8afm9zfrz1skd2xg3ng62cq1xvxiq645w6mxf7y05";
name = "ki18n-5.19.0.tar.xz";
};
};
kiconthemes = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kiconthemes-5.19.0.tar.xz";
sha256 = "0riicirgda3w2b30dzsa2lq9xrr4y04qwhxyzq1p8gn2x4pp3g3n";
name = "kiconthemes-5.19.0.tar.xz";
};
};
kidletime = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kidletime-5.19.0.tar.xz";
sha256 = "0jlbzqv36ddhfhk8xkkgw0xhq8s371z9ama1cyv2xq8kk4vjywc6";
name = "kidletime-5.19.0.tar.xz";
};
};
kimageformats = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kimageformats-5.19.0.tar.xz";
sha256 = "1ydizc6b0ncndazk62h8y249yfcx381pwzyivfpka1f69zfgyvv5";
name = "kimageformats-5.19.0.tar.xz";
};
};
kinit = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kinit-5.19.0.tar.xz";
sha256 = "03l7pijqdnnsfg6yz9p73p7xa86sldayggl6rc5hpkzmgyczcfzm";
name = "kinit-5.19.0.tar.xz";
};
};
kio = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kio-5.19.0.tar.xz";
sha256 = "0c7smp7cajivx53shy65mp9zcc51pha9iyvh37dggfflxy3xf9nv";
name = "kio-5.19.0.tar.xz";
};
};
kitemmodels = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kitemmodels-5.19.0.tar.xz";
sha256 = "0skmim986qnncbzd84vm1wp1fr41jn04af2dgckirsk23d35bln7";
name = "kitemmodels-5.19.0.tar.xz";
};
};
kitemviews = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kitemviews-5.19.0.tar.xz";
sha256 = "118zv46mvrfwbvl06bb1m8axv92wnp4pfs36hsxvnjl7gfjk5xjn";
name = "kitemviews-5.19.0.tar.xz";
};
};
kjobwidgets = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kjobwidgets-5.19.0.tar.xz";
sha256 = "1qzf8nzy8rxkdai9aj2lyrww90245v0p2q115xiz73bsg9rahmji";
name = "kjobwidgets-5.19.0.tar.xz";
};
};
kjs = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/portingAids/kjs-5.19.0.tar.xz";
sha256 = "08m01762hb25vm020g3v37bh40cgvcfrj45ql135klx96x9imfaf";
name = "kjs-5.19.0.tar.xz";
};
};
kjsembed = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/portingAids/kjsembed-5.19.0.tar.xz";
sha256 = "1wmkgy8jgm21y2cvcbv1fdv29dxxla8n6ws78kzzbbw4cgqwwl48";
name = "kjsembed-5.19.0.tar.xz";
};
};
kmediaplayer = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/portingAids/kmediaplayer-5.19.0.tar.xz";
sha256 = "1vhqr2c7q8vwzdj29vpmfjfhyal8wp9ffirrnqc98vb6sffs85ay";
name = "kmediaplayer-5.19.0.tar.xz";
};
};
knewstuff = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/knewstuff-5.19.0.tar.xz";
sha256 = "12acd12vxk9z83zg3yz8lvmmb8737z9lzd4hs9a3jcs1z5k2nhb4";
name = "knewstuff-5.19.0.tar.xz";
};
};
knotifications = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/knotifications-5.19.0.tar.xz";
sha256 = "0grgm0ws16gp2j77nslqpl1jpxbi0m6g59zr7v1xnmzdk2j6n4av";
name = "knotifications-5.19.0.tar.xz";
};
};
knotifyconfig = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/knotifyconfig-5.19.0.tar.xz";
sha256 = "161brvryxzdkny7sf6icn1jpyi6rnw6jc808gdf5g41v50xpnxfj";
name = "knotifyconfig-5.19.0.tar.xz";
};
};
kpackage = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kpackage-5.19.0.tar.xz";
sha256 = "1km4sjgxfljp2pnjnzj48q3c574zvj7341a57n4ifhjwj37yzxdv";
name = "kpackage-5.19.0.tar.xz";
};
};
kparts = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kparts-5.19.0.tar.xz";
sha256 = "05g59x2mrqygawzcwgw3igl5n96l649h0kpzh37sfq4i8kg15g7l";
name = "kparts-5.19.0.tar.xz";
};
};
kpeople = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kpeople-5.19.0.tar.xz";
sha256 = "1ksf6g71li1xk4q98cvwkam8m8g32x2815kj1gfwbg4g6iw74w98";
name = "kpeople-5.19.0.tar.xz";
};
};
kplotting = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kplotting-5.19.0.tar.xz";
sha256 = "169x4m9ms8yhfha8zclnl8wrnfhfqshpwwg4b5bd046pcrkqmnqq";
name = "kplotting-5.19.0.tar.xz";
};
};
kpty = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kpty-5.19.0.tar.xz";
sha256 = "0289vzfjwppwqj9h03flzhwm18dnxz11hqhdhr9990x7rw6a4n03";
name = "kpty-5.19.0.tar.xz";
};
};
kross = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/portingAids/kross-5.19.0.tar.xz";
sha256 = "1nv7mrhn7wa4bs2a164x42d3b37akyvhkxqs8cg5fqp4vr2wkw0p";
name = "kross-5.19.0.tar.xz";
};
};
krunner = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/portingAids/krunner-5.19.0.tar.xz";
sha256 = "054s8309lxi27gpbg7iygbcxsp0pwrzbzww3h8zp2a9yiic4s5mx";
name = "krunner-5.19.0.tar.xz";
};
};
kservice = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kservice-5.19.0.tar.xz";
sha256 = "02lbia26r2462nwksizaxjfkhxfqqs732dp495yx8bjc7wcv3srm";
name = "kservice-5.19.0.tar.xz";
};
};
ktexteditor = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/ktexteditor-5.19.0.tar.xz";
sha256 = "0v3l44w4k43ajs81i8386hszk3x7rajjlb6z3jb7q98vhp91b5dp";
name = "ktexteditor-5.19.0.tar.xz";
};
};
ktextwidgets = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/ktextwidgets-5.19.0.tar.xz";
sha256 = "1xydb76r6x1p10bkr2nlqg3md78jw8zvqad0h42dgvl4f5xvjknp";
name = "ktextwidgets-5.19.0.tar.xz";
};
};
kunitconversion = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kunitconversion-5.19.0.tar.xz";
sha256 = "11g1vhqkrb1k748drj7klkbb7jca3dybakcmcgqf53g8vxfih8kb";
name = "kunitconversion-5.19.0.tar.xz";
};
};
kwallet = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kwallet-5.19.0.tar.xz";
sha256 = "0z0c62fdfx9syrq6z7bk0ihac4yqyxpycll7h3mijj29km4jnpjm";
name = "kwallet-5.19.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kwidgetsaddons-5.19.0.tar.xz";
sha256 = "0b85ng0dj5gpzifqmhyzgx61nb37vq7d0gvfpfazlcp5n27ywivm";
name = "kwidgetsaddons-5.19.0.tar.xz";
};
};
kwindowsystem = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kwindowsystem-5.19.0.tar.xz";
sha256 = "115xs34r74j9zcsw69glnh8w59iyh764n3gniawwrk23c6yb8fch";
name = "kwindowsystem-5.19.0.tar.xz";
};
};
kxmlgui = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kxmlgui-5.19.0.tar.xz";
sha256 = "1al2xifiyvl3zpva9nqap8gb6vqfgmf2fnhkmymm02rwg4yn4gah";
name = "kxmlgui-5.19.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/kxmlrpcclient-5.19.0.tar.xz";
sha256 = "0lji7cxvh2lmjz42lx6ymz962gr4cyqfzksz0n5vgzfk5z0vq98g";
name = "kxmlrpcclient-5.19.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/modemmanager-qt-5.19.0.tar.xz";
sha256 = "05x9jicryjw9fj02arpya8xsh79rsnljnqjfpwbb7pi38f9i8v4w";
name = "modemmanager-qt-5.19.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/networkmanager-qt-5.19.0.tar.xz";
sha256 = "0wi0mkygzbvvyil1nyzc3ihgilvpx6j7caqaa9k38p85g93vsq13";
name = "networkmanager-qt-5.19.0.tar.xz";
};
};
oxygen-icons5 = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/oxygen-icons5-5.19.0.tar.xz";
sha256 = "09vfwcyidj3bl0qr4sq78bkc69zp9x8dwp8bsay5y05q8591dkg0";
name = "oxygen-icons5-5.19.0.tar.xz";
};
};
plasma-framework = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/plasma-framework-5.19.0.tar.xz";
sha256 = "1588r1jag0s9hhw4qq7mr2mcdd3d9az5ngb3z1l58xdhvfcc4497";
name = "plasma-framework-5.19.0.tar.xz";
};
};
solid = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/solid-5.19.0.tar.xz";
sha256 = "02bnvhscb55r6q5hkyh7rqi6zsc3r974y3x9shi8l0xbs78snkgz";
name = "solid-5.19.0.tar.xz";
};
};
sonnet = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/sonnet-5.19.0.tar.xz";
sha256 = "02ringh0wyiq1n19c200bcyf5x2w5jhw0pcxvfjzjai1sjig03x7";
name = "sonnet-5.19.0.tar.xz";
};
};
threadweaver = {
version = "5.19.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.19/threadweaver-5.19.0.tar.xz";
sha256 = "1jm1sw7xq76s2ggghm6qqdn7452myy9n7p5zzdb01qbaw2y1x4pw";
name = "threadweaver-5.19.0.tar.xz";
};
};
}

View file

@ -52,6 +52,7 @@ let
extra-cmake-modules = callPackage ./extra-cmake-modules {};
frameworkintegration = callPackage ./frameworkintegration.nix {};
kactivities = callPackage ./kactivities.nix {};
kactivities-stats = callPackage ./kactivities-stats.nix {};
kapidox = callPackage ./kapidox.nix {};
karchive = callPackage ./karchive.nix {};
kauth = callPackage ./kauth {};
@ -68,8 +69,8 @@ let
kded = callPackage ./kded.nix {};
kdelibs4support = callPackage ./kdelibs4support {};
kdesignerplugin = callPackage ./kdesignerplugin.nix {};
kdewebkit = callPackage ./kdewebkit.nix {};
kdesu = callPackage ./kdesu.nix {};
kdewebkit = callPackage ./kdewebkit.nix {};
kdnssd = callPackage ./kdnssd.nix {};
kdoctools = callPackage ./kdoctools {};
kemoticons = callPackage ./kemoticons.nix {};

View file

@ -4,7 +4,7 @@
set -x
# The trailing slash at the end is necessary!
RELEASE_URL="http://download.kde.org/stable/frameworks/5.19/"
RELEASE_URL="http://download.kde.org/stable/frameworks/5.21/"
EXTRA_WGET_ARGS='-A *.tar.xz'
mkdir tmp; cd tmp

View file

@ -0,0 +1,9 @@
{ kdeFramework, lib, extra-cmake-modules
, boost, kactivities, kconfig }:
kdeFramework {
name = "kactivities-stats";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ boost kactivities kconfig ];
}

View file

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

View file

@ -0,0 +1,34 @@
Index: kinit-5.21.0/src/kdeinit/kinit.cpp
===================================================================
--- kinit-5.21.0.orig/src/kdeinit/kinit.cpp
+++ kinit-5.21.0/src/kdeinit/kinit.cpp
@@ -657,19 +657,16 @@ static pid_t launch(int argc, const char
if (!libpath.isEmpty()) {
if (libpath_relative) {
- // NB: Because Qt makes the actual dlopen() call, the
- // RUNPATH of kdeinit is *not* respected - see
- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945
- // - so we try hacking it in ourselves
- QString install_lib_dir = QFile::decodeName(
- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
- QString orig_libpath = libpath;
- libpath = install_lib_dir + libpath;
- l.setFileName(libpath);
- if (!l.load()) {
- libpath = orig_libpath;
- l.setFileName(libpath);
- l.load();
+ // Try to load the library relative to the active profiles.
+ QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
+ // Reverse the profile list.
+ std::reverse(profiles.begin(), profiles.end());
+ const QString libdir = QString::fromLatin1("/lib/");
+ Q_FOREACH (const QByteArray &profile, profiles) {
+ if (!profile.isEmpty()) {
+ l.setFileName(QFile::decodeName(profile) + libdir + libpath);
+ if (l.load()) break;
+ }
}
} else {
l.load();

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