Merge branch 'qt-5.5'

This commit is contained in:
Thomas Tuegel 2015-09-27 16:07:05 -05:00
commit cbe318d531
291 changed files with 10137 additions and 449 deletions

View file

@ -981,6 +981,72 @@ stdenv.mkDerivation {
</programlisting> </programlisting>
</section> </section>
<section xml:id="sec-language-qt"><title>Qt</title>
<para>The information in this section applies to Qt 5.5 and later.</para>
<para>Qt is an application development toolkit for C++. Although it is
not a distinct programming language, there are special considerations
for packaging Qt-based programs and libraries. A small set of tools
and conventions has grown out of these considerations.</para>
<section xml:id="ssec-qt-libraries"><title>Libraries</title>
<para>Packages that provide libraries should be listed in
<varname>qt5LibsFun</varname> so that the library is built with each
Qt version. A set of packages is provided for each version of Qt; for
example, <varname>qt5Libs</varname> always provides libraries built
with the latest version, <varname>qt55Libs</varname> provides
libraries built with Qt 5.5, and so on. To avoid version conflicts, no
top-level attributes are created for these packages.</para>
</section>
<section xml:id="ssec-qt-programs"><title>Programs</title>
<para>Application packages do not need to be built with every Qt
version. To ensure consistency between the package's dependencies,
call the package with <literal>qt5Libs.callPackage</literal> instead
of the usual <literal>callPackage</literal>. An older version may be
selected in case of incompatibility. For example, to build with Qt
5.5, call the package with
<literal>qt55Libs.callPackage</literal>.</para>
<para>Several environment variables must be set at runtime for Qt
applications to function correctly, including:</para>
<itemizedlist>
<listitem><para><envar>QT_PLUGIN_PATH</envar></para></listitem>
<listitem><para><envar>QML_IMPORT_PATH</envar></para></listitem>
<listitem><para><envar>QML2_IMPORT_PATH</envar></para></listitem>
<listitem><para><envar>XDG_DATA_DIRS</envar></para></listitem>
</itemizedlist>
<para>To ensure that these are set correctly, the program must be wrapped by
invoking <literal>wrapQtProgram <replaceable>program</replaceable></literal>
during installation (for example, during
<literal>fixupPhase</literal>). <literal>wrapQtProgram</literal>
accepts the same options as <literal>makeWrapper</literal>.
</para>
</section>
<section xml:id="ssec-qt-kde"><title>KDE</title>
<para>Many of the considerations above also apply to KDE packages,
especially the need to set the correct environment variables at
runtime. To ensure that this is done, invoke <literal>wrapKDEProgram
<replaceable>program</replaceable></literal> during
installation. <literal>wrapKDEProgram</literal> also generates a
<literal>ksycoca</literal> database so that required data and services
can be found. Like its Qt counterpart,
<literal>wrapKDEProgram</literal> accepts the same options as
<literal>makeWrapper</literal>.</para>
</section>
</section>
<!-- <!--
<section><title>Haskell</title> <section><title>Haskell</title>

View file

@ -1204,7 +1204,7 @@ echo @foo@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>Qt</term> <term>Qt 4</term>
<listitem><para>Sets the <envar>QTDIR</envar> environment variable <listitem><para>Sets the <envar>QTDIR</envar> environment variable
to Qts path.</para></listitem> to Qts path.</para></listitem>
</varlistentry> </varlistentry>

View file

@ -164,4 +164,23 @@ rec {
drv' = (lib.head outputsList).value; drv' = (lib.head outputsList).value;
in lib.deepSeq drv' drv'; in lib.deepSeq drv' drv';
/* Make a set of packages with a common scope. All packages called
with the provided `callPackage' will be evaluated with the same
arguments. Any package in the set may depend on any other. The
`override' function allows subsequent modification of the package
set in a consistent way, i.e. all packages in the set will be
called with the overridden packages. The package sets may be
hierarchical: the packages in the set are called with the scope
provided by `newScope' and the set provides a `newScope' attribute
which can form the parent scope for later package sets. */
makeScope = newScope: f:
let self = f self // {
newScope = scope: newScope (self // scope);
callPackage = self.newScope {};
override = g: makeScope newScope (self_:
let super = f self_;
in super // g super self_);
};
in self;
} }

View file

@ -155,6 +155,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "GNU Free Documentation License v1.2"; fullName = "GNU Free Documentation License v1.2";
}; };
fdl13 = spdx {
spdxId = "GFDL-1.3";
fullName = "GNU Free Documentation License v1.2";
};
free = { free = {
fullName = "Unspecified free software license"; fullName = "Unspecified free software license";
}; };

View file

@ -1,7 +1,8 @@
{ stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl { stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig
, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs , qtscriptgenerator, gettext, curl , libxml2, mysql, taglib
, qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon , taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod
, strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null }: , phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -16,9 +17,13 @@ stdenv.mkDerivation rec {
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
buildInputs = [ qtscriptgenerator stdenv.cc.libc gettext curl nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
libxml2 mysql.lib taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa nepomuk_core ]; buildInputs = [
qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.lib
taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2
libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
];
cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake { stdenv, fetchurl, cmake
, withQt4 ? false, qt4 , withQt4 ? false, qt4
, withQt5 ? true, qt5 , withQt5 ? true, qtbase, qtsvg, qttools
# I'm unable to make KDE work here, crashes at runtime so I simply # I'm unable to make KDE work here, crashes at runtime so I simply
# make Qt4 the default until someone who wants KDE can figure it out. # make Qt4 the default until someone who wants KDE can figure it out.
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ cmake ] [ cmake ]
++ stdenv.lib.optional withQt4 qt4 ++ stdenv.lib.optional withQt4 qt4
++ stdenv.lib.optionals withQt5 (with qt5; [ base svg tools ]) ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ]
++ stdenv.lib.optional withKDE4 kde4.kdelibs ++ stdenv.lib.optional withKDE4 kde4.kdelibs
++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
@ -91,6 +91,10 @@ stdenv.mkDerivation rec {
"-DENABLE_UDISKS2=ON" "-DENABLE_UDISKS2=ON"
]; ];
postInstall = ''
wrapQtProgram "$out/bin/cantata"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://code.google.com/p/cantata/; homepage = http://code.google.com/p/cantata/;
description = "A graphical client for MPD"; description = "A graphical client for MPD";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fftw, libsndfile, qt5 }: { stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia }:
let let
@ -39,7 +39,7 @@ in stdenv.mkDerivation {
owner = "gillesdegottex"; owner = "gillesdegottex";
}; };
buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ]; buildInputs = [ fftw libsndfile qtbase qtmultimedia ];
postPatch = '' postPatch = ''
substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}' substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
@ -53,6 +53,10 @@ in stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = ''
wrapQtProgram "$out/bin/dfasma"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit version; inherit version;
description = "Analyse and compare audio files in time and frequency"; description = "Analyse and compare audio files in time and frequency";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fftw, freeglut, qt5 { stdenv, fetchFromGitHub, fftw, freeglut, qtbase, qtmultimedia
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, jackSupport ? false, libjack2 ? null , jackSupport ? false, libjack2 ? null
, portaudioSupport ? false, portaudio ? null }: , portaudioSupport ? false, portaudio ? null }:
@ -18,7 +18,7 @@ stdenv.mkDerivation {
owner = "gillesdegottex"; owner = "gillesdegottex";
}; };
buildInputs = [ fftw freeglut qt5.base qt5.multimedia ] buildInputs = [ fftw freeglut qtbase qtmultimedia ]
++ stdenv.lib.optional alsaSupport [ alsaLib ] ++ stdenv.lib.optional alsaSupport [ alsaLib ]
++ stdenv.lib.optional jackSupport [ libjack2 ] ++ stdenv.lib.optional jackSupport [ libjack2 ]
++ stdenv.lib.optional portaudioSupport [ portaudio ]; ++ stdenv.lib.optional portaudioSupport [ portaudio ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qt5, taglib }: { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, taglib }:
let version = "2.00"; in let version = "2.00"; in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -30,7 +30,7 @@ stdenv.mkDerivation {
}; };
# TODO: upgrade libav when "Audio sample format conversion failed" is fixed # TODO: upgrade libav when "Audio sample format conversion failed" is fixed
buildInputs = [ libav_0_8 libkeyfinder qt5.base qt5.xmlpatterns taglib ]; buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ];
postPatch = '' postPatch = ''
substituteInPlace is_KeyFinder.pro \ substituteInPlace is_KeyFinder.pro \

View file

@ -1,6 +1,7 @@
{ stdenv, fetchurl, cmake, pkgconfig { stdenv, fetchurl, cmake, pkgconfig
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, portaudio, qt5 #, tesseract , portaudio, qtbase, qtdeclarative, qtenginio, qtscript, qtsvg, qttools
, qtwebkit, qtxmlpatterns
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -36,8 +37,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
portaudio qt5.base qt5.declarative qt5.enginio qt5.script qt5.svg qt5.tools portaudio qtbase qtdeclarative qtenginio qtscript qtsvg qttools
qt5.webkit qt5.xmlpatterns #tesseract qtwebkit qtxmlpatterns #tesseract
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -2,7 +2,7 @@
{ stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
, libsndfile, pkgconfig, libpulseaudio, qt5, redland , libsndfile, pkgconfig, libpulseaudio, qtbase, redland
, rubberband, serd, sord, vampSDK, fftwFloat , rubberband, serd, sord, vampSDK, fftwFloat
}: }:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ libsndfile qt5.base fftw fftwFloat bzip2 librdf rubberband [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband
libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
serd serd
sord sord
@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/{bin,share/sonic-visualiser} mkdir -p $out/{bin,share/sonic-visualiser}
cp sonic-visualiser $out/bin/ cp sonic-visualiser $out/bin/
cp -r samples $out/share/sonic-visualiser/ cp -r samples $out/share/sonic-visualiser/
wrapQtProgram "$out/bin/sonic-visualiser"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,6 +1,7 @@
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit , intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit
, qt4 ? null, qt5 ? null , qt4 ? null
, withQt5 ? false, qtbase
}: }:
let let
@ -20,14 +21,14 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
qt4 libaudit qt4 libaudit
] ++ stdenv.lib.optional (qt5 != null) qt5.base; ] ++ stdenv.lib.optional withQt5 qtbase;
configureFlags = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--disable-tests" "--disable-tests"
] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt"
++ stdenv.lib.optional ((qt5.base or null) != null) "--enable-liblightdm-qt5"; ++ stdenv.lib.optional withQt5 "--enable-liblightdm-qt5";
installFlags = [ installFlags = [
"sysconfdir=\${out}/etc" "sysconfdir=\${out}/etc"

View file

@ -1,5 +1,7 @@
{ stdenv, fetchpatch, makeWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs { stdenv, fetchpatch, fetchFromGitHub, cmake, pkgconfig, libxcb
, libXdmcp, libXau, qt5, pam, systemd }: , libpthreadstubs, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam
, systemd
}:
let let
version = "0.11.0"; version = "0.11.0";
@ -14,9 +16,9 @@ stdenv.mkDerivation rec {
sha256 = "1s1gm0xvgwzrpxgni3ngdj8phzg21gkk1jyiv2l2i5ayl0jdm7ig"; sha256 = "1s1gm0xvgwzrpxgni3ngdj8phzg21gkk1jyiv2l2i5ayl0jdm7ig";
}; };
nativeBuildInputs = [ cmake pkgconfig qt5.tools makeWrapper ]; nativeBuildInputs = [ cmake pkgconfig qttools ];
buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qt5.base pam systemd ]; buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ];
patches = [ (fetchpatch { patches = [ (fetchpatch {
url = "https://github.com/sddm/sddm/commit/9bc21ee7da5de6b2531d47d1af4d7b0a169990b9.patch"; url = "https://github.com/sddm/sddm/commit/9bc21ee7da5de6b2531d47d1af4d7b0a169990b9.patch";
@ -32,8 +34,8 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
wrapProgram $out/bin/sddm-greeter \ wrapQtProgram $out/bin/sddm
--set QML2_IMPORT_PATH "${qt5.declarative}/lib/qt5/qml/" wrapQtProgram $out/bin/sddm-greeter
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -1,4 +1,6 @@
{stdenv, fetchurl, kdelibs, cmake, gettext }: { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, shared_mime_info, kdelibs
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kile-2.1.3"; name = "kile-2.1.3";
@ -8,7 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "18nfi37s46v9xav7vyki3phasddgcy4m7nywzxis198vr97yqqx0"; sha256 = "18nfi37s46v9xav7vyki3phasddgcy4m7nywzxis198vr97yqqx0";
}; };
nativeBuildInputs = [ cmake gettext ]; nativeBuildInputs = [
automoc4 cmake gettext perl pkgconfig shared_mime_info
];
buildInputs = [ kdelibs ]; buildInputs = [ kdelibs ];
# for KDE 4.7 the nl translations fail since kile-2.1.2 # for KDE 4.7 the nl translations fail since kile-2.1.2

View file

@ -1,32 +0,0 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
shared_desktop_ontologies, marble, libmysql }:
stdenv.mkDerivation rec {
name = "digikam-2.9.0";
src = fetchurl {
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
sha256 = "181vf065j1zz26zahkb7hy3fk4837nvwm61cnykvni7w40w0zpbk";
};
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
opencv libkexiv2 libkipi boost shared_desktop_ontologies marble libmysql ];
# Make digikam find some FindXXXX.cmake
KDEDIRS="${marble}:${qjson}";
enableParallelBuilding = true;
meta = {
description = "Photo Management Program";
license = "GPL";
homepage = http://www.digikam.org;
maintainers = with stdenv.lib.maintainers; [ viric urkud ];
inherit (kdelibs.meta) platforms;
};
}

View file

@ -1,8 +1,8 @@
{ stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake { stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake
, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun , eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun
, libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff , libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff
, libusb1, liblqr1, marble, mysql, opencv, phonon, pkgconfig, qca2 , libusb1, liblqr1, marble, mysql, opencv, perl, phonon, pkgconfig
, qimageblitz, qjson, qt4, soprano , qca2, qimageblitz, qjson, qt4, soprano
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m"; sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m";
}; };
nativeBuildInputs = [ cmake automoc4 pkgconfig ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
buildInputs = [ buildInputs = [
boost eigen gettext jasper kdelibs kdepimlibs lcms lensfun boost eigen jasper kdelibs kdepimlibs lcms lensfun libgphoto2
libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf libtiff marble
libtiff marble mysql.lib opencv phonon qca2 qimageblitz qjson qt4 mysql.lib opencv phonon qca2 qimageblitz qjson qt4
shared_desktop_ontologies soprano shared_desktop_ontologies soprano
]; ];
@ -26,7 +26,11 @@ stdenv.mkDerivation rec {
KDEDIRS="${marble}:${qjson}"; KDEDIRS="${marble}:${qjson}";
# Help digiKam find libusb, otherwise gphoto2 support is disabled # Help digiKam find libusb, otherwise gphoto2 support is disabled
cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0 -DDIGIKAMSC_COMPILE_LIBKFACE=ON"; cmakeFlags = [
"-DLIBUSB_LIBRARIES=${libusb1}/lib"
"-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0"
"-DDIGIKAMSC_COMPILE_LIBKFACE=ON"
];
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl, kdelibs, automoc4, boost, pkgconfig, graphviz, gettext }: { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, boost, graphviz
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kgraphviewer-${version}"; name = "kgraphviewer-${version}";
@ -9,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs"; sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs";
}; };
buildInputs = [ kdelibs automoc4 boost pkgconfig graphviz gettext ]; buildInputs = [ kdelibs boost graphviz ];
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A Graphviz dot graph viewer for KDE"; description = "A Graphviz dot graph viewer for KDE";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, kdelibs, imlib, cmake, pkgconfig, gettext }: { stdenv, fetchurl, automoc4, kdelibs, imlib, cmake, pkgconfig, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kuickshow-0.9.1"; name = "kuickshow-0.9.1";
@ -10,5 +10,5 @@ stdenv.mkDerivation rec {
buildInputs = [ kdelibs imlib ]; buildInputs = [ kdelibs imlib ];
nativeBuildInputs = [ cmake gettext pkgconfig ]; nativeBuildInputs = [ automoc4 cmake gettext pkgconfig ];
} }

View file

@ -0,0 +1,43 @@
{ mkDerivation
, lib
, extra-cmake-modules
, kdoctools
, karchive
, kconfig
, kcrash
, kdbusaddons
, ki18n
, kiconthemes
, khtml
, kio
, kservice
, kpty
, kwidgetsaddons
, libarchive
}:
mkDerivation {
name = "ark";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
karchive
kconfig
kcrash
kdbusaddons
ki18n
kiconthemes
khtml
kio
kservice
kpty
kwidgetsaddons
libarchive
];
meta = {
license = with lib.licenses; [ gpl2 lgpl3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

View file

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

View file

@ -0,0 +1,69 @@
# 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";
mkDerivation = args:
let
inherit (stdenv) mkDerivation;
inherit (args) name;
sname = args.sname or name;
inherit (srcs."${sname}") src version;
in 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 {});
});
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 {};
print-manager = callPackage ./print-manager.nix {};
};
newScope = scope: pkgs.kf513.newScope ({ inherit mkDerivation; } // scope);
in lib.makeScope newScope packages

View file

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

View file

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

View file

@ -0,0 +1,47 @@
#! /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/applications/15.08.1/"
EXTRA_WGET_ARGS='-A *.tar.xz'
mkdir tmp; cd tmp
wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
cat >../srcs.nix <<EOF
# DO NOT EDIT! This file is generated automatically by manifest.sh
{ fetchurl, mirror }:
{
EOF
workdir=$(pwd)
find . | while read src; do
if [[ -f "${src}" ]]; then
url="${src:2}"
# 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:]]*-\)\+,,')
sha256=$(nix-hash --type sha256 --base32 --flat "$src")
cat >>../srcs.nix <<EOF
$name = {
version = "$version";
src = fetchurl {
url = "\${mirror}/$url";
sha256 = "$sha256";
name = "$filename";
};
};
EOF
fi
done
echo "}" >>../srcs.nix
cd ..

View file

@ -0,0 +1,27 @@
{ mkDerivation
, lib
, automoc4
, cmake
, perl
, pkgconfig
, kdelibs
, ffmpeg
}:
mkDerivation {
name = "ffmpegthumbs";
nativeBuildInputs = [
automoc4
cmake
perl
pkgconfig
];
buildInputs = [
kdelibs
ffmpeg
];
meta = {
license = with lib.licenses; [ gpl2 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

View file

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

View file

@ -0,0 +1,37 @@
{ mkDerivation
, lib
, extra-cmake-modules
, kdoctools
, baloo
, exiv2
, kactivities
, kdelibs4support
, kio
, lcms2
, phonon
, qtsvg
, qtx11extras
}:
mkDerivation {
name = "gwenview";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
baloo
exiv2
kactivities
kdelibs4support
kio
lcms2
phonon
qtsvg
qtx11extras
];
meta = {
license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

View file

@ -0,0 +1,63 @@
{ mkDerivation
, 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
}:
mkDerivation {
name = "kate";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
qtscript
kactivities
kconfig
kcrash
kguiaddons
kiconthemes
ki18n
kinit
kjobwidgets
kio
kparts
ktexteditor
kwindowsystem
kxmlgui
kdbusaddons
kwallet
plasma-framework
kitemmodels
knotifications
threadweaver
knewstuff
libgit2
];
meta = {
license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

View file

@ -0,0 +1,29 @@
{ mkDerivation
, lib
, automoc4
, cmake
, perl
, pkgconfig
, kdelibs
, libkexiv2
, libkdcraw
}:
mkDerivation {
name = "kdegraphics-thumbnailers";
nativeBuildInputs = [
automoc4
cmake
perl
pkgconfig
];
buildInputs = [
kdelibs
libkexiv2
libkdcraw
];
meta = {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

View file

@ -0,0 +1,56 @@
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

View file

@ -0,0 +1,25 @@
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

View file

@ -0,0 +1,43 @@
{ mkDerivation, attica, attr, automoc4, avahi, bison, cmake
, docbook_xml_dtd_42, docbook_xsl, flex, giflib, herqq, ilmbase
, libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig
, polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info
, soprano, strigi, udev, xz
, lib
}:
mkDerivation {
name = "kdelibs";
buildInputs = [
attica attr avahi giflib herqq 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
];
# 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"
"-DHUPNP_ENABLED=ON"
"-DWITH_SOLID_UDISKS2=ON"
"-DKDE_DEFAULT_HOME=.kde"
];
setupHook = ./setup-hook.sh;
meta = {
licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

View file

@ -0,0 +1,12 @@
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)

View file

@ -0,0 +1,10 @@
addQt4Plugins() {
if [[ -d "$1/lib/qt4/plugins" ]]; then
propagatedUserEnvPkgs+=" $1"
fi
if [[ -d "$1/lib/kde4/plugins" ]]; then
propagatedUserEnvPkgs+=" $1"
fi
}
envHooks+=(addQt4Plugins)

View file

@ -0,0 +1,31 @@
{ mkDerivation
, lib
, automoc4
, cmake
, perl
, pkgconfig
, boost
, gpgme
, kdelibs
, kdepimlibs
}:
mkDerivation {
name = "kgpg";
nativeBuildInputs = [
automoc4
cmake
perl
pkgconfig
];
buildInputs = [
boost
gpgme
kdelibs
kdepimlibs
];
meta = {
license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

View file

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

View file

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

View file

@ -0,0 +1,27 @@
{ mkDerivation
, lib
, automoc4
, cmake
, perl
, pkgconfig
, libraw
, kdelibs
}:
mkDerivation {
name = "libkdcraw";
nativeBuildInputs = [
automoc4
cmake
perl
pkgconfig
];
buildInputs = [
kdelibs
libraw
];
meta = {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

View file

@ -0,0 +1,27 @@
{ mkDerivation
, lib
, automoc4
, cmake
, perl
, pkgconfig
, exiv2
, kdelibs
}:
mkDerivation {
name = "libkexiv2";
nativeBuildInputs = [
automoc4
cmake
perl
pkgconfig
];
buildInputs = [
exiv2
kdelibs
];
meta = {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

View file

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

View file

@ -0,0 +1,41 @@
{ mkDerivation
, lib
, automoc4
, cmake
, perl
, pkgconfig
, kdelibs
, qimageblitz
, poppler_qt4
, libspectre
, libkexiv2
, djvulibre
, libtiff
, freetype
, ebook_tools
}:
mkDerivation {
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 ];
};
}

View file

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

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, makeWrapper, qt5, qmltermwidget }: { stdenv, fetchgit, makeWrapper, qtbase, qtquick1, qmltermwidget }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.0"; version = "1.0.0";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sed -i -e '/qmltermwidget/d' cool-retro-term.pro sed -i -e '/qmltermwidget/d' cool-retro-term.pro
''; '';
buildInputs = [ makeWrapper qt5.base qt5.quick1 qmltermwidget ]; buildInputs = [ makeWrapper qtbase qtquick1 qmltermwidget ];
configurePhase = "qmake PREFIX=$out"; configurePhase = "qmake PREFIX=$out";
@ -26,8 +26,7 @@ stdenv.mkDerivation rec {
mv $out/usr/bin $out/bin mv $out/usr/bin $out/bin
rmdir $out/usr rmdir $out/usr
wrapProgram $out/bin/cool-retro-term \ wrapQtProgram $out/bin/cool-retro-term
--prefix QML2_IMPORT_PATH : "${qmltermwidget}/lib/qml/"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -1,7 +1,8 @@
{ stdenv, fetchurl, makeWrapper, cmake, qt4, perl, shared_mime_info, libvorbis, taglib { stdenv, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig
, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext , shared_mime_info, libvorbis, taglib , flac, libsamplerate
, transcode, cdrdao, cdrtools, dvdplusrwtools, vcdimager, cdparanoia , libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao
, kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null , cdrtools, dvdplusrwtools, vcdimager, cdparanoia , kdelibs
, kdemultimedia, phonon, libkcddb ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,13 +13,13 @@ stdenv.mkDerivation rec {
sha256 = "10f07465g9860chfnvrp9w3m686g6j9f446xgnnx7h82d1sb42rd"; sha256 = "10f07465g9860chfnvrp9w3m686g6j9f446xgnnx7h82d1sb42rd";
}; };
buildInputs = nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
[ cmake qt4 perl shared_mime_info libvorbis taglib
flac libsamplerate libdvdread lame libsndfile buildInputs = [
libmad gettext stdenv.cc.libc shared_mime_info libvorbis taglib flac libsamplerate libdvdread
kdelibs kdemultimedia automoc4 phonon lame libsndfile libmad stdenv.cc.libc kdelibs
libkcddb makeWrapper cdparanoia kdemultimedia phonon libkcddb makeWrapper cdparanoia
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }: { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, xf86_input_wacom }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wacomtablet-2.1.0"; name = "wacomtablet-2.1.0";
@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ kdelibs xf86_input_wacom ]; buildInputs = [ kdelibs xf86_input_wacom ];
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "KDE Wacom graphic tablet configuration tool"; description = "KDE Wacom graphic tablet configuration tool";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2 { stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
, qjson , gettext, kdelibs, libXtst, libfakekey, makeWrapper, qca2, qjson
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4"; sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4";
}; };
buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qjson ]; buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper qca2 qjson ];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A tool to connect and sync your devices with KDE"; description = "A tool to connect and sync your devices with KDE";

View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }: { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, taglib, exiv2, podofo, qt4, phonon
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "krename-4.0.9"; name = "krename-4.0.9";
@ -8,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "11bdg5vdcs393n0aibhm3jh3wxlk5kz78jhkwf7cj9086qkg9wds"; sha256 = "11bdg5vdcs393n0aibhm3jh3wxlk5kz78jhkwf7cj9086qkg9wds";
}; };
buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ]; buildInputs = [ kdelibs taglib exiv2 podofo qt4 phonon ];
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
meta = { meta = {
homepage = http://www.krename.net; homepage = http://www.krename.net;

View file

@ -1,4 +1,6 @@
{stdenv, fetchurl, gettext, kdelibs, kde_baseapps}: { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, kde_baseapps
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "krusader-2.4.0-beta1"; name = "krusader-2.4.0-beta1";
@ -6,7 +8,8 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/krusader/${name}.tar.bz2"; url = "mirror://sourceforge/krusader/${name}.tar.bz2";
sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6"; sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6";
}; };
buildInputs = [ gettext kdelibs kde_baseapps ]; buildInputs = [ kdelibs kde_baseapps ];
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
meta = { meta = {
description = "Norton/Total Commander clone for KDE"; description = "Norton/Total Commander clone for KDE";

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, kdelibs, kdebase_workspace, gettext }: { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, kdebase_workspace }:
let version = "0.11"; let version = "0.11";
in in
@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0g27aswh8iz5v67v1wkjny4p100vs2gm0lw0qzfkg6sw1pb4i519"; sha256 = "0g27aswh8iz5v67v1wkjny4p100vs2gm0lw0qzfkg6sw1pb4i519";
}; };
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
buildInputs = [ kdelibs kdebase_workspace ]; buildInputs = [ kdelibs kdebase_workspace ];

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, kdelibs, gettext, konsole }: { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, konsole }:
let let
pname = "yakuake"; pname = "yakuake";
@ -14,7 +15,7 @@ stdenv.mkDerivation {
buildInputs = [ kdelibs ]; buildInputs = [ kdelibs ];
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
patchPhase = '' patchPhase = ''
substituteInPlace app/terminal.cpp --replace \"konsolepart\" "\"${konsole}/lib/kde4/libkonsolepart.so\"" substituteInPlace app/terminal.cpp --replace \"konsolepart\" "\"${konsole}/lib/kde4/libkonsolepart.so\""

View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, kdelibs }: { stdenv, fetchgit, automoc4, cmake, perl, pkgconfig, kdelibs }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kwebkitpart-${version}"; name = "kwebkitpart-${version}";
@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
buildInputs = [ kdelibs ]; buildInputs = [ kdelibs ];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.phreedom ]; maintainers = [ maintainers.phreedom ];

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, kde4, gettext, pkgconfig, shared_desktop_ontologies, qca2, qoauth }: { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kde4, shared_desktop_ontologies, qca2, qoauth }:
assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077 assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077
@ -12,7 +13,9 @@ stdenv.mkDerivation rec {
buildInputs = [ kde4.kdelibs qca2 qoauth ]; buildInputs = [ kde4.kdelibs qca2 qoauth ];
nativeBuildInputs = [ gettext pkgconfig shared_desktop_ontologies ]; nativeBuildInputs = [
automoc4 cmake gettext perl pkgconfig shared_desktop_ontologies
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;

View file

@ -1,6 +1,7 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf
, dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM , dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM
, libX11, libXmu, ncurses, popt, qt5, zlib , libX11, libXmu, ncurses, popt, qt5, zlib
, qtbase, qtdeclarative, qtwebkit
}: }:
# this package contains the daemon version of dropbox # this package contains the daemon version of dropbox
@ -32,20 +33,13 @@ let
"i686-linux" = "x86"; "i686-linux" = "x86";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
interpreter =
{
"x86_64-linux" = "ld-linux-x86-64.so.2";
"i686-linux" = "ld-linux.so.2";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
# relative location where the dropbox libraries are stored # relative location where the dropbox libraries are stored
appdir = "opt/dropbox"; appdir = "opt/dropbox";
ldpath = stdenv.lib.makeSearchPath "lib" ldpath = stdenv.lib.makeSearchPath "lib"
[ [
dbus_libs gcc glib libdrm libffi libICE libSM libX11 dbus_libs gcc.cc glib libdrm libffi libICE libSM libX11 libXmu
libXmu ncurses popt qt5.base qt5.declarative qt5.webkit ncurses popt qtbase qtdeclarative qtwebkit zlib
zlib
]; ];
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -58,24 +52,22 @@ let
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "dropbox-${version}-bin"; name = "dropbox-${version}";
src = fetchurl { src = fetchurl {
name = "dropbox-${version}.tar.gz"; name = "dropbox-${version}.tar.gz";
url = "https://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz"; url = "https://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz";
inherit sha256; inherit sha256;
}; };
sourceRoot = "."; sourceRoot = ".dropbox-dist";
patchPhase = '' buildInputs = [ makeWrapper patchelf ];
rm -f .dropbox-dist/dropboxd dontPatchELF = true; # patchelf invoked explicitly below
''; dontStrip = true; # already done
buildInputs = [ makeWrapper ];
installPhase = '' installPhase = ''
mkdir -p "$out/${appdir}" mkdir -p "$out/${appdir}"
cp -r ".dropbox-dist/dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" cp -r "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
rm "$out/${appdir}/libdrm.so.2" rm "$out/${appdir}/libdrm.so.2"
rm "$out/${appdir}/libffi.so.6" rm "$out/${appdir}/libffi.so.6"
@ -101,28 +93,62 @@ in stdenv.mkDerivation {
rm "$out/${appdir}/qt.conf" rm "$out/${appdir}/qt.conf"
rm -fr "$out/${appdir}/plugins" rm -fr "$out/${appdir}/plugins"
find "$out/${appdir}" -type f -a -perm -0100 \
-print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \;
RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir}
echo "updating rpaths to: $RPATH"
find "$out/${appdir}" -type f -a -perm -0100 \
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
mkdir -p "$out/share/applications" mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* $out/share/applications cp "${desktopItem}/share/applications/"* $out/share/applications
mkdir -p "$out/bin"
makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
--prefix LD_LIBRARY_PATH : "${ldpath}"
mkdir -p "$out/share/icons" mkdir -p "$out/share/icons"
ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor" ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor"
mkdir -p "$out/bin"
RPATH="${ldpath}:$out/${appdir}"
makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
--prefix LD_LIBRARY_PATH : "$RPATH"
'';
fixupPhase = ''
INTERP=$(cat $NIX_CC/nix-support/dynamic-linker)
RPATH="${ldpath}:$out/${appdir}"
getType='s/ *Type: *\([A-Z]*\) (.*/\1/'
find "$out/${appdir}" -type f -a -perm -0100 -print | while read obj; do
dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true)
if [[ -n "$dynamic" ]]; then
type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType")
if [[ "$type" == "EXEC" ]]; then
echo "patching interpreter path in $type $obj"
patchelf --set-interpreter "$INTERP" "$obj"
echo "patching RPATH in $type $obj"
oldRPATH=$(patchelf --print-rpath "$obj")
patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj"
echo "shrinking RPATH in $type $obj"
patchelf --shrink-rpath "$obj"
elif [[ "$type" == "DYN" ]]; then
echo "patching RPATH in $type $obj"
oldRPATH=$(patchelf --print-rpath "$obj")
patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj"
echo "shrinking RPATH in $type $obj"
patchelf --shrink-rpath "$obj"
else
echo "unknown ELF type \"$type\"; not patching $obj"
fi
fi
done
''; '';
meta = { meta = {
homepage = "http://www.dropbox.com"; homepage = "http://www.dropbox.com";
description = "Online stored folders (daemon version)"; description = "Online stored folders (daemon version)";
maintainers = with stdenv.lib.maintainers; [ ttuegel ]; maintainers = with stdenv.lib.maintainers; [ ttuegel ];
platforms = [ "i686-linux" "x86_64-linux" ];
}; };
} }

View file

@ -1,12 +1,19 @@
{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, kde_workspace, gettext, dbus_libs, farstream { stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig
, pkgconfigUpstream , qt_gstreamer1, telepathy_glib, telepathy_logger, qjson, flex, bison, qca2 }: , telepathy_qt, kdelibs, kde_workspace, dbus_glib, dbus_libs, farstream
, qt_gstreamer1, telepathy_glib, telepathy_logger
, qjson, flex, bison, qca2 }:
let let
pkgconfig = pkgconfigUpstream;
version = "0.8.80"; version = "0.8.80";
manifest = import (./. + "/${version}.nix"); manifest = import (./. + "/${version}.nix");
overrides = { overrides = {
call_ui = x : x // {
NIX_CFLAGS_COMPILE =
"-I${telepathy_glib}/include/telepathy-1.0"
+ " -I${dbus_glib}/include/dbus-1.0"
+ " -I${dbus_libs}/include/dbus-1.0";
};
telepathy_logger_qt = x : x // { telepathy_logger_qt = x : x // {
NIX_CFLAGS_COMPILE = "-I${dbus_libs}/include/dbus-1.0"; NIX_CFLAGS_COMPILE = "-I${dbus_libs}/include/dbus-1.0";
}; };
@ -38,7 +45,9 @@ let
inherit sha256; inherit sha256;
}; };
nativeBuildInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs); nativeBuildInputs =
[ automoc4 cmake gettext perl pkgconfig ]
++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs);
buildInputs = [ kdelibs telepathy_qt ] buildInputs = [ kdelibs telepathy_qt ]
++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals
++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs); ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs);

View file

@ -3,15 +3,12 @@
, client ? false # build Quassel client , client ? false # build Quassel client
, previews ? false # enable webpage previews on hovering over URLs , previews ? false # enable webpage previews on hovering over URLs
, tag ? "" # tag added to the package name , tag ? "" # tag added to the package name
, useQt5 ? false, phonon_qt5, libdbusmenu_qt5, qca-qt5
, withKDE ? stdenv.isLinux # enable KDE integration , withKDE ? stdenv.isLinux # enable KDE integration
, kf5 ? null, kdelibs ? null , kdelibs ? null
, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2 }: , stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2 }:
let useKF5 = useQt5 && withKDE; let buildClient = monolithic || client;
useKDE4 = withKDE && !useQt5;
buildClient = monolithic || client;
buildCore = monolithic || daemon; buildCore = monolithic || daemon;
in in
@ -19,8 +16,7 @@ assert stdenv.isLinux;
assert monolithic -> !client && !daemon; assert monolithic -> !client && !daemon;
assert client || daemon -> !monolithic; assert client || daemon -> !monolithic;
assert useKDE4 -> kdelibs != null; assert withKDE -> kdelibs != null;
assert useKF5 -> kf5 != null;
assert !buildClient -> !withKDE; # KDE is used by the client only assert !buildClient -> !withKDE; # KDE is used by the client only
let let
@ -39,20 +35,9 @@ in with stdenv; mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = buildInputs =
[ cmake makeWrapper ] [ cmake makeWrapper qt ]
++ [(if useQt5 then qt.base else qt)] ++ lib.optionals buildCore [qca2]
++ lib.optionals buildCore (if useQt5 then [qt.script qca-qt5] else [qca2]) ++ lib.optionals withKDE [automoc4 kdelibs phonon];
++ lib.optionals buildClient
( lib.optionals (previews && useQt5) [qt.webkit qt.webkitwidgets]
++ lib.optionals useQt5 [libdbusmenu_qt5 phonon_qt5]
++ lib.optionals useKDE4 [automoc4 kdelibs phonon]
++ lib.optionals useKF5
(with kf5; [
extra-cmake-modules kconfigwidgets kcoreaddons
knotifications knotifyconfig ktextwidgets kwidgetsaddons
kxmlgui
])
);
NIX_CFLAGS_COMPILE = "-fPIC"; NIX_CFLAGS_COMPILE = "-fPIC";
@ -63,8 +48,7 @@ in with stdenv; mkDerivation rec {
++ edf daemon "WANT_CORE" ++ edf daemon "WANT_CORE"
++ edf client "WANT_QTCLIENT" ++ edf client "WANT_QTCLIENT"
++ edf withKDE "WITH_KDE" ++ edf withKDE "WITH_KDE"
++ edf previews "WITH_WEBKIT" ++ edf previews "WITH_WEBKIT";
++ edf useQt5 "USE_QT5";
preFixup = preFixup =
lib.optionalString buildClient '' lib.optionalString buildClient ''
@ -85,6 +69,6 @@ in with stdenv; mkDerivation rec {
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
maintainers = with maintainers; [ phreedom ttuegel ]; maintainers = with maintainers; [ phreedom ttuegel ];
repositories.git = https://github.com/quassel/quassel.git; repositories.git = https://github.com/quassel/quassel.git;
inherit ((if useQt5 then qt.base else qt).meta) platforms; inherit (qt.meta) platforms;
}; };
} }

View file

@ -0,0 +1,91 @@
{ monolithic ? true # build monolithic Quassel
, daemon ? false # build Quassel daemon
, client ? false # build Quassel client
, previews ? false # enable webpage previews on hovering over URLs
, tag ? "" # tag added to the package name
, stdenv, fetchurl, cmake, makeWrapper, dconf
, qtbase, qtscript, qtwebkit
, phonon, libdbusmenu, qca-qt5
, withKDE ? stdenv.isLinux # enable KDE integration
, extra-cmake-modules
, kconfigwidgets
, kcoreaddons
, knotifications
, knotifyconfig
, ktextwidgets
, kwidgetsaddons
, kxmlgui
}:
let
buildClient = monolithic || client;
buildCore = monolithic || daemon;
in
assert stdenv.isLinux;
assert monolithic -> !client && !daemon;
assert client || daemon -> !monolithic;
assert !buildClient -> !withKDE; # KDE is used by the client only
let
edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
in with stdenv; mkDerivation rec {
version = "0.12.2";
name = "quassel${tag}-${version}";
src = fetchurl {
url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
sha256 = "15vqjiw38mifvnc95bhvy0zl23xxldkwg2byx9xqbyw8rfgggmkb";
};
enableParallelBuilding = true;
buildInputs =
[ cmake makeWrapper qtbase ]
++ lib.optionals buildCore [qtscript qca-qt5]
++ lib.optionals buildClient [libdbusmenu phonon]
++ lib.optionals (buildClient && previews) [qtwebkit]
++ lib.optionals (buildClient && withKDE) [
extra-cmake-modules kconfigwidgets kcoreaddons
knotifications knotifyconfig ktextwidgets kwidgetsaddons
kxmlgui
];
cmakeFlags = [
"-DEMBED_DATA=OFF"
"-DSTATIC=OFF"
"-DUSE_QT5=ON"
]
++ edf monolithic "WANT_MONO"
++ edf daemon "WANT_CORE"
++ edf client "WANT_QTCLIENT"
++ edf withKDE "WITH_KDE"
++ edf previews "WITH_WEBKIT";
preFixup =
lib.optionalString buildClient ''
wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
'';
meta = with stdenv.lib; {
homepage = http://quassel-irc.org/;
description = "Qt/KDE distributed IRC client suppporting a remote daemon";
longDescription = ''
Quassel IRC is a cross-platform, distributed IRC client,
meaning that one (or multiple) client(s) can attach to
and detach from a central core -- much like the popular
combination of screen and a text-based IRC client such
as WeeChat, but graphical (based on Qt4/KDE4 or Qt5/KF5).
'';
license = stdenv.lib.licenses.gpl3;
maintainers = with maintainers; [ phreedom ttuegel ];
repositories.git = https://github.com/quassel/quassel.git;
inherit (qtbase.meta) platforms;
};
}

View file

@ -0,0 +1,33 @@
From 6b5730e729d72c8d9242163e7061b956abee61f5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 12 Sep 2015 16:14:10 -0500
Subject: [PATCH] search paths
---
src/utilities/utility.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/utilities/utility.cpp b/src/utilities/utility.cpp
index 2e322aa..2e9e4d2 100644
--- a/src/utilities/utility.cpp
+++ b/src/utilities/utility.cpp
@@ -299,6 +299,7 @@ QString Utility::searchExternalPrograms(const QString& programToSearch, bool& pr
QString programPathName;
QStringList searchPathList = Settings::searchPathList();
+ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z";
QStringList programsWithDifferentNames = programToSearch.split(";");
@@ -368,7 +369,7 @@ QStringList Utility::buildPriorityArgument(const int& processPriority, const int
QStringList niceProcessArgs;
// look for 'nice' location :
- QString nicePath = KStandardDirs::findExe("nice");
+ QString nicePath = QString("/usr/bin/nice");
niceProcessArgs.append(nicePath);
niceProcessArgs.append("-n");
--
2.5.0

View file

@ -5,17 +5,17 @@
, unrar, p7zip, par2cmdline, coreutils , unrar, p7zip, par2cmdline, coreutils
}: }:
let version = "0.8.4"; let version = "1.1.0";
name = "kwooty-${version}"; name = "kwooty-${version}";
in stdenv.mkDerivation { in stdenv.mkDerivation {
inherit name; inherit name;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/kwooty/${name}.tar.gz"; url = "http://kde-apps.org/CONTENT/content-files/114385-${name}.tar.gz";
sha256 = "0i3zmh7y52n5k0yn3xc6zjpjz75f48nly40n394i6sxy89psgfc2"; sha256 = "10a9asjv6ja1xdjli2399dyka2rbia3qdm5bdpmcng6xdsbhx3ap";
}; };
patches = [ ./searchPath.patch ]; patches = [ ./0001-search-paths.patch ];
postPatch = '' postPatch = ''
echo "Changing paths to archive utilities to the nix store"; echo "Changing paths to archive utilities to the nix store";

View file

@ -1,19 +0,0 @@
--- kwooty-kwooty/src/utility.cpp 2012-01-24 22:22:45.091383072 +0100
+++ kwooty-kwooty/src/utility.cpp 2012-01-24 22:29:08.526208140 +0100
@@ -299,6 +299,7 @@
QString programPathName;
QStringList searchPathList = Settings::searchPathList();
+ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z";
QStringList programsWithDifferentNames = programToSearch.split(";");
@@ -363,7 +364,7 @@
QStringList niceProcessArgs;
// look for 'nice' location :
- QString nicePath = KStandardDirs::findExe("nice");
+ QString nicePath = QString("/usr/bin/nice");
niceProcessArgs.append(nicePath);
niceProcessArgs.append("-n");

View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl, cmake, gettext, kdelibs, qimageblitz, kdepimlibs, gpgme }: { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, qimageblitz, kdepimlibs, gpgme
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "basket-1.81"; name = "basket-1.81";
@ -12,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ]; buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ];
nativeBuildInputs = [ cmake gettext ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
meta = { meta = {
description = "A multi-purpose note-taking application"; description = "A multi-purpose note-taking application";

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa { stdenv, fetchurl, automoc4, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa
, kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 , kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2
, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4 , fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4
, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular
, libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase , libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase
, libodfgen, opencolorio, openjpeg, pstoedit, librevenge , libodfgen, opencolorio, openjpeg, pstoedit, librevenge
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "calligra-2.8.7"; name = "calligra-2.8.7";
@ -14,12 +14,13 @@ stdenv.mkDerivation rec {
sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg"; sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg";
}; };
nativeBuildInputs = [ cmake perl pkgconfig ]; nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
# TODO: package Vc, libWPS, Spnav, m2mml, LibEtonyek, poppler-qt4-xpdf-headers # TODO: package Vc, libWPS, Spnav, m2mml, LibEtonyek, poppler-qt4-xpdf-headers
# not found: xbase, openjpeg(too new) # not found: xbase, openjpeg(too new)
buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs buildInputs = [
kdelibs attica zlib libpng boost mesa kdepimlibs
createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl
shared_desktop_ontologies okular libodfgen opencolorio openjpeg shared_desktop_ontologies okular libodfgen opencolorio openjpeg

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi, gettext, boost }: { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, kdepimlibs, akonadi, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "plasmoid-eventlist-0.6.96"; name = "plasmoid-eventlist-0.6.96";
@ -8,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "26cc7bd1c465bf1379fd0ba1fa8592eaa62f2553734d1b283e17359103908eea"; sha256 = "26cc7bd1c465bf1379fd0ba1fa8592eaa62f2553734d1b283e17359103908eea";
}; };
buildInputs = [ kdelibs kdepimlibs akonadi gettext boost ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
buildInputs = [ kdelibs kdepimlibs akonadi boost ];
meta = { meta = {
inherit (kdelibs.meta) platforms; inherit (kdelibs.meta) platforms;

View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl, kdelibs, libxslt, poppler_qt4 }: { stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
, kdelibs, libxslt, poppler_qt4
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kbibtex"; pname = "kbibtex";
@ -15,4 +17,5 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ kdelibs libxslt poppler_qt4 ]; buildInputs = [ kdelibs libxslt poppler_qt4 ];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
} }

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, gettext, boost }: { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig, shared_mime_info
, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "skrooge-1.10.0"; name = "skrooge-1.10.0";
@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite boost ]; buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite boost ];
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig shared_mime_info ];
meta = { meta = {
inherit (kdelibs.meta) platforms; inherit (kdelibs.meta) platforms;

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, kdelibs, kdepimlibs, boost }: { stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
, kdelibs, kdepimlibs, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zanshin-0.2.1"; name = "zanshin-0.2.1";
@ -8,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "155k72vk7kw0p0x9dhlky6q017kanzcbwvp4dpf1hcbr1dsr55fx"; sha256 = "155k72vk7kw0p0x9dhlky6q017kanzcbwvp4dpf1hcbr1dsr55fx";
}; };
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
buildInputs = [ kdelibs kdepimlibs boost ]; buildInputs = [ kdelibs kdepimlibs boost ];
meta = { meta = {

View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db, kdelibs, expat }: { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, apr, aprutil, subversion, db, kdelibs, expat
}:
# the homepage mentions this is the final release. # the homepage mentions this is the final release.
# from now on, kdesvn will be part of the official kde software distribution # from now on, kdesvn will be part of the official kde software distribution
@ -16,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ apr aprutil subversion db kdelibs expat ]; buildInputs = [ apr aprutil subversion db kdelibs expat ];
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
meta = { meta = {
description = "KDE SVN front-end"; description = "KDE SVN front-end";

View file

@ -1,4 +1,8 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, shared_desktop_ontologies, kdemultimedia, taglib, glibc, gettext }: { stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
, kdelibs, phonon, soprano, shared_desktop_ontologies
, kdemultimedia, taglib, glibc, gettext
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bangarang-2.1"; name = "bangarang-2.1";
@ -7,8 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1"; sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1";
}; };
buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ]; buildInputs = [
nativeBuildInputs = [ cmake ]; kdelibs phonon soprano shared_desktop_ontologies kdemultimedia
taglib gettext
];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
patches = [ ./gcc-4.7.patch ]; patches = [ ./gcc-4.7.patch ];

View file

@ -1,5 +1,9 @@
{ stdenv, fetchurl, cmake, automoc4, qt5, kf5, dvdauthor, xineLib, libmpeg2, libav, { stdenv, fetchurl
libdvdread, libdvdnav, dvdplusrwtools, phonon_qt5 }: , cmake, automoc4
, dvdauthor, xineLib, libmpeg2, libav, libdvdread, libdvdnav, dvdplusrwtools
, phonon, qtx11extras
, extra-cmake-modules, kio, kiconthemes, ki18n, kdesu, kdoctools, solid
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.0.3"; version = "3.0.3";
@ -30,18 +34,17 @@ stdenv.mkDerivation rec {
libdvdread libdvdread
libdvdnav libdvdnav
dvdplusrwtools dvdplusrwtools
automoc4 #automoc4
phonon_qt5 phonon
] ++ (with kf5; [
extra-cmake-modules extra-cmake-modules
kio kio
solid solid
qt5.x11extras qtx11extras
kiconthemes kiconthemes
ki18n ki18n
kdesu kdesu
kdoctools ];
]); nativeBuildInputs = [ kdoctools ];
meta = { meta = {
description = "DVD backup and DVD authoring program"; description = "DVD backup and DVD authoring program";

View file

@ -14,9 +14,12 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
automoc4 cmake frei0r gettext kdelibs libv4l makeWrapper mlt perl frei0r kdelibs libv4l mlt phonon qimageblitz qjson qt4
phonon pkgconfig qimageblitz qjson qt4 shared_desktop_ontologies shared_desktop_ontologies soprano
shared_mime_info soprano ];
nativeBuildInputs = [
automoc4 cmake gettext makeWrapper perl pkgconfig shared_mime_info
]; ];
propagatedUserEnvPkgs = [ oxygen_icons ]; propagatedUserEnvPkgs = [ oxygen_icons ];

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig, gettext, makeWrapper { stdenv, fetchurl
, automoc4, cmake, gettext, makeWrapper, perl, pkgconfig
, kdelibs, cairo, dbus_glib, mplayer , kdelibs, cairo, dbus_glib, mplayer
}: }:
@ -11,10 +12,9 @@ stdenv.mkDerivation {
sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky";
}; };
buildInputs = [ buildInputs = [ kdelibs cairo dbus_glib ];
cmake gettext pkgconfig makeWrapper
kdelibs cairo dbus_glib nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ];
];
postInstall = '' postInstall = ''
wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin

View file

@ -8,13 +8,14 @@
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau, libsamplerate , libvdpau, libsamplerate
, onlyLibVLC ? false , onlyLibVLC ? false
, qt4 ? null, qt5 ? null, withQt5 ? false , qt4 ? null
, withQt5 ? false, qtbase ? null
, jackSupport ? false , jackSupport ? false
}: }:
with stdenv.lib; with stdenv.lib;
assert (withQt5 -> qt5 != null); assert (withQt5 -> qtbase != null);
assert (!withQt5 -> qt4 != null); assert (!withQt5 -> qt4 != null);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
] ]
++ (if withQt5 then with qt5; [ base ] else [qt4]) ++ [(if withQt5 then qtbase else qt4)]
++ optional jackSupport libjack2; ++ optional jackSupport libjack2;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View file

@ -0,0 +1,36 @@
From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 7 Sep 2015 18:55:44 -0500
Subject: [PATCH] ksysguard disable signalplottertest
---
libs/ksysguard/tests/CMakeLists.txt | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt
index d472fd7..f178b71 100644
--- a/libs/ksysguard/tests/CMakeLists.txt
+++ b/libs/ksysguard/tests/CMakeLists.txt
@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB
set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp)
kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} )
target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
-
-
-# KGraphicsSignalPlotter benchmark
-set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp)
-kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} )
-target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
-
-
-# KSignalPlotter unit test
-set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp)
-kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} )
-target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} )
-
-
-
-
--
2.5.0

View file

@ -0,0 +1,62 @@
From 93081f817f20bbc26b55e1b37b22d60535d153f7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 10 Sep 2015 18:41:57 -0500
Subject: [PATCH] duplicate add_test
---
RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt | 1 -
RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt | 1 -
RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt | 1 -
RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt | 1 -
RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt | 1 -
5 files changed, 5 deletions(-)
diff --git a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
index 32a2504..4fbb838 100644
--- a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
+++ b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
@@ -33,4 +33,3 @@ target_link_libraries(TestDotFileFormatPlugin
${QT_QTTEST_LIBRARY}
${KDE4_KDECORE_LIBS}
)
-add_test(TestDotFileFormatPlugin TestDotFileFormatPlugin)
diff --git a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
index 615004c..6383bd8 100644
--- a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
+++ b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
@@ -32,4 +32,3 @@ target_link_libraries(TestGmlFileFormatPlugin
${QT_QTTEST_LIBRARY}
${KDE4_KDECORE_LIBS}
)
-add_test(TestGmlFileFormatPlugin TestGmlFileFormatPlugin)
diff --git a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
index f9cdbfa..842d14b 100644
--- a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
+++ b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
@@ -30,4 +30,3 @@ target_link_libraries(TestKmlFileFormatPlugin
${QT_QTTEST_LIBRARY}
${KDE4_KDECORE_LIBS}
)
-add_test(TestKmlFileFormatPlugin TestKmlFileFormatPlugin)
diff --git a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
index 33c0da8..70cab8d 100644
--- a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
+++ b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
@@ -35,4 +35,3 @@ target_link_libraries(TestTgfFileFormatPlugin
${QT_QTTEST_LIBRARY}
${KDE4_KDECORE_LIBS}
)
-add_test(TestTgfFileFormatPlugin TestTgfFileFormatPlugin)
diff --git a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
index b52736e..58ee40e 100644
--- a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
+++ b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
@@ -29,5 +29,4 @@ target_link_libraries(TestTikzFileFormatPlugin
${QT_QTTEST_LIBRARY}
${KDE4_KDECORE_LIBS}
)
-add_test(TestTikzFileFormatPlugin TestTikzFileFormatPlugin)
--
2.5.0

View file

@ -1,4 +1,4 @@
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4 { callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4, perl, pkgconfig
, release, branch, ignoreList, extraSubpkgs , release, branch, ignoreList, extraSubpkgs
}: }:
@ -29,13 +29,14 @@ rec {
# released as individual tarballs # released as individual tarballs
kdeMonoPkg = name: kdeMonoPkg = name:
let n_ = name; v_ = getAttr name manifest.versions; in let n_ = name; v_ = getAttr name manifest.versions; in
a@{meta, name ? n_, version ? v_, ...}: a@{meta, name ? n_, version ? v_, nativeBuildInputs ? [], ...}:
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "${name}-${version}"; name = "${name}-${version}";
src = kdesrc name version; src = kdesrc name version;
nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ];
meta = defMeta // meta; meta = defMeta // meta;
enableParallelBuilding = true; enableParallelBuilding = true;
} // (removeAttrs a [ "meta" "name" ])); } // (removeAttrs a [ "meta" "name" "nativeBuildInputs" ]));
# kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
# API. # API.
@ -45,10 +46,11 @@ rec {
kdeSubdirPkg = module: kdeSubdirPkg = module:
{name, subdir ? name, sane ? name}: {name, subdir ? name, sane ? name}:
let name_ = name; version_ = getAttr module manifest.versions; in let name_ = name; version_ = getAttr module manifest.versions; in
a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, ...}: a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, nativeBuildInputs ? [], ...}:
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "${name}-${release}"; name = "${name}-${release}";
src = kdesrc module version; src = kdesrc module version;
nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ];
cmakeFlags = cmakeFlags =
[ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
"-DBUILD_doc=TRUE" "-DBUILD_doc=TRUE"
@ -56,7 +58,7 @@ rec {
] ++ cmakeFlags; ] ++ cmakeFlags;
meta = defMeta // meta; meta = defMeta // meta;
enableParallelBuilding = module.enableParallelBuilding or true; enableParallelBuilding = module.enableParallelBuilding or true;
} // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); } // (removeAttrs a [ "meta" "name" "cmakeFlags" "nativeBuildInputs" ]));
# A KDE monolithic module # A KDE monolithic module
kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; }; kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };

View file

@ -1,4 +1,4 @@
{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2 { kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info
, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio
, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme
}: }:
@ -14,7 +14,7 @@ kde {
#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late #todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ shared_mime_info ];
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";

View file

@ -18,7 +18,7 @@ kde {
kactivities kactivities
]; ];
nativeBuildInputs = [ pkgconfig ]; patches = [ ./files/ksysguard-0001-disable-signalplottertest.patch ];
preConfigure = preConfigure =
'' ''

View file

@ -1,6 +1,8 @@
{ kde, kdelibs, boost, grantlee }: { kde, kdelibs, boost, grantlee }:
kde { kde {
patches = [ ../files/rocs-0001-duplicate-add_test.patch ];
buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ]; buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ];
NIX_CFLAGS_COMPILE = "-fexceptions"; NIX_CFLAGS_COMPILE = "-fexceptions";

View file

@ -1,6 +1,7 @@
{ kde, kdelibs, libkdegames }: { kde, kdelibs, libkdegames, shared_mime_info }:
kde { kde {
buildInputs = [ kdelibs libkdegames ]; buildInputs = [ kdelibs libkdegames ];
nativeBuildInputs = [ shared_mime_info ];
meta = { meta = {
description = "a relaxing card sorting game"; description = "a relaxing card sorting game";
}; };

View file

@ -1,8 +1,10 @@
{ kde, kdelibs, libkdegames }: { kde, kdelibs, libkdegames, shared_mime_info }:
kde { kde {
# TODO: package qvoronoi # TODO: package qvoronoi
nativeBuildInputs = [ shared_mime_info ];
buildInputs = [ kdelibs libkdegames ]; buildInputs = [ kdelibs libkdegames ];
meta = { meta = {

View file

@ -4,8 +4,6 @@ kde {
buildInputs = [ kdelibs libraw lcms2 ]; buildInputs = [ kdelibs libraw lcms2 ];
nativeBuildInputs = [ pkgconfig ];
meta = { meta = {
description = "Library for decoding RAW images"; description = "Library for decoding RAW images";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;

View file

@ -1,5 +1,5 @@
{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, poppler_qt4 { stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, poppler_qt4
, pkgconfig, doxygen, ebook_tools , pkgconfig, doxygen, ebook_tools, automoc4, cmake, perl
}: }:
kde { kde {
@ -11,7 +11,7 @@ kde {
poppler_qt4 ebook_tools poppler_qt4 ebook_tools
]; ];
nativeBuildInputs = [ pkgconfig doxygen ]; nativeBuildInputs = [ automoc4 cmake perl pkgconfig doxygen ];
meta = { meta = {
description = "NEPOMUK core"; description = "NEPOMUK core";

View file

@ -1,4 +1,5 @@
{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }: { kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies
, shared_mime_info }:
kde { kde {
@ -9,6 +10,8 @@ kde {
libxslt libxslt
]; ];
nativeBuildInputs = [ shared_mime_info ];
meta = { meta = {
description = "KDE PIM runtime"; description = "KDE PIM runtime";
license = "GPL"; license = "GPL";

View file

@ -1,13 +1,20 @@
{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison { kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
, kdelibs, akonadi, libxslt, nepomuk_core , kdelibs, akonadi, libxslt, nepomuk_core
, shared_desktop_ontologies, qjson }: , shared_mime_info, shared_desktop_ontologies, qjson
, automoc4, cmake, perl
}:
kde { kde {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
cmakeFlags = [
"-DCMAKE_MINIMUM_REQUIRED_VERSION=3.3"
];
buildInputs = buildInputs =
[ boost gpgme libical libxslt qjson prison [ boost gpgme libical libxslt qjson prison
openldap cyrus_sasl akonadi shared_desktop_ontologies openldap cyrus_sasl akonadi shared_desktop_ontologies
shared_mime_info
]; ];
propagatedBuildInputs = [ kdelibs nepomuk_core ]; propagatedBuildInputs = [ kdelibs nepomuk_core ];

View file

@ -1,7 +1,7 @@
{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig { kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
, boost, eigen2, kde_workspace, attica, qca2, qimageblitz , boost, eigen2, kde_workspace, attica, qca2, qimageblitz
, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt , kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
, qjson, qoauth }: , qjson, qoauth, shared_mime_info }:
kde { kde {
@ -14,7 +14,7 @@ kde {
shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ shared_mime_info ];
meta = { meta = {
description = "KDE Plasma Addons"; description = "KDE Plasma Addons";

View file

@ -1,8 +1,10 @@
{ kde, kdelibs, qca2 }: { kde, kdelibs, qca2, shared_mime_info }:
kde { kde {
buildInputs = [ kdelibs qca2 ]; buildInputs = [ kdelibs qca2 ];
nativeBuildInputs = [ shared_mime_info ];
# TODO: Look what does -DBUILD_mobile add # TODO: Look what does -DBUILD_mobile add
enableParallelBuilding = false; enableParallelBuilding = false;

View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }: { stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
, kdelibs, gettext, release, branch, stable
}:
let let
@ -18,7 +20,11 @@ let
buildInputs = [ gettext kdelibs ]; buildInputs = [ gettext kdelibs ];
cmakeFlags = "-Wno-dev"; nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
cmakeFlags = [
"-Wno-dev"
];
meta = { meta = {
description = "KDE translation for ${lang}"; description = "KDE translation for ${lang}";

View file

@ -0,0 +1,39 @@
{ mkDerivation
, extra-cmake-modules
, bluez-qt
, kcoreaddons
, kdbusaddons
, kded
, ki18n
, kiconthemes
, kio
, knotifications
, kwidgetsaddons
, kwindowsystem
, plasma-framework
, qtdeclarative
, shared_mime_info
}:
mkDerivation {
name = "bluedevil";
nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
buildInputs = [
bluez-qt
kcoreaddons
kdbusaddons
kded
ki18n
kiconthemes
kio
knotifications
kwidgetsaddons
kwindowsystem
plasma-framework
qtdeclarative
];
postInstall = ''
wrapKDEProgram "$out/bin/bluedevil-wizard"
wrapKDEProgram "$out/bin/bluedevil-sendfile"
'';
}

View file

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

View file

@ -0,0 +1,35 @@
{ mkDerivation
, extra-cmake-modules
, frameworkintegration
, kcmutils
, kconfigwidgets
, kcoreaddons
, kdecoration
, kguiaddons
, ki18n
, kwindowsystem
, qtx11extras
}:
mkDerivation {
name = "breeze-qt5";
sname = "breeze";
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
frameworkintegration
kcmutils
kconfigwidgets
kcoreaddons
kdecoration
kguiaddons
ki18n
kwindowsystem
qtx11extras
];
cmakeFlags = [ "-DUSE_KDE4=OFF" ];
postInstall = ''
wrapKDEProgram "$out/bin/breeze-settings5"
'';
}

View file

@ -0,0 +1,87 @@
# 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.kf513;
kdeApps = pkgs.kdeApps_15_08;
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
mirror = "mirror://kde";
mkDerivation = args:
let
inherit (stdenv) mkDerivation;
inherit (args) name;
sname = args.sname or name;
inherit (srcs."${sname}") src version;
in 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.nix {};
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.nix {};
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.nix {};
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 mkDerivation; } // scope);
in lib.makeScope newScope addPackages

View file

@ -0,0 +1,47 @@
#! /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/plasma/5.4.1/"
EXTRA_WGET_ARGS='-A *.tar.xz'
mkdir tmp; cd tmp
wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
cat >../srcs.nix <<EOF
# DO NOT EDIT! This file is generated automatically by manifest.sh
{ fetchurl, mirror }:
{
EOF
workdir=$(pwd)
find . | while read src; do
if [[ -f "${src}" ]]; then
url="${src:2}"
# 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:]]*-\)\+,,')
sha256=$(nix-hash --type sha256 --base32 --flat "$src")
cat >>../srcs.nix <<EOF
$name = {
version = "$version";
src = fetchurl {
url = "\${mirror}/$url";
sha256 = "$sha256";
name = "$filename";
};
};
EOF
fi
done
echo "}" >>../srcs.nix
cd ..

View file

@ -0,0 +1,41 @@
{ mkDerivation
, extra-cmake-modules
, kcmutils
, kconfig
, kdelibs4support
, kdesu
, kdoctools
, ki18n
, kiconthemes
, kwindowsystem
, qtsvg
, qtx11extras
}:
mkDerivation {
name = "kde-cli-tools";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils
kconfig
kdelibs4support
kdesu
ki18n
kiconthemes
kwindowsystem
qtsvg
qtx11extras
];
postInstall = ''
wrapKDEProgram "$out/bin/kmimetypefinder5"
wrapKDEProgram "$out/bin/ksvgtopng5"
wrapKDEProgram "$out/bin/ktraderclient5"
wrapKDEProgram "$out/bin/kioclient5"
wrapKDEProgram "$out/bin/kdecp5"
wrapKDEProgram "$out/bin/keditfiletype5"
wrapKDEProgram "$out/bin/kcmshell5"
wrapKDEProgram "$out/bin/kdemv5"
wrapKDEProgram "$out/bin/kstart5"
wrapKDEProgram "$out/bin/kde-open5"
'';
}

View file

@ -0,0 +1,26 @@
{ mkDerivation
, extra-cmake-modules
, glib
, gtk2
, gtk3
, karchive
, kcmutils
, kconfigwidgets
, ki18n
, kiconthemes
, kio
, knewstuff
}:
mkDerivation {
name = "kde-gtk-config";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
glib gtk2 gtk3 karchive kcmutils kconfigwidgets ki18n kiconthemes
kio knewstuff
];
cmakeFlags = [
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
];
}

View file

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

View file

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

View file

@ -0,0 +1,18 @@
{ mkDerivation
, extra-cmake-modules
, kdoctools
, kdelibs4support
, qtx11extras
}:
mkDerivation {
name = "kgamma5";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
kdelibs4support
qtx11extras
];
}

View file

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

View file

@ -0,0 +1,34 @@
{ mkDerivation
, extra-cmake-modules
, kdoctools
, kcmutils
, kdbusaddons
, kdelibs4support
, kglobalaccel
, ki18n
, kio
, kxmlgui
, plasma-framework
, plasma-workspace
, qtx11extras
}:
mkDerivation {
name = "khotkeys";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
kcmutils
kdbusaddons
kdelibs4support
kglobalaccel
ki18n
kio
kxmlgui
plasma-framework
plasma-workspace
qtx11extras
];
}

View file

@ -0,0 +1,53 @@
{ mkDerivation
, extra-cmake-modules
, kdoctools
, kcmutils
, kcompletion
, kconfig
, kconfigwidgets
, kcoreaddons
, kdbusaddons
, kdeclarative
, kdelibs4support
, ki18n
, kiconthemes
, kio
, kpackage
, kservice
, kwidgetsaddons
, kxmlgui
, libraw1394
, pciutils
, solid
}:
mkDerivation {
name = "kinfocenter";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
kcmutils
kcompletion
kconfig
kconfigwidgets
kcoreaddons
kdbusaddons
kdeclarative
kdelibs4support
ki18n
kiconthemes
kio
kpackage
kservice
kwidgetsaddons
kxmlgui
libraw1394
pciutils
solid
];
postInstall = ''
wrapKDEProgram "$out/bin/kinfocenter"
'';
}

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