diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:47:26 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:53:02 +0100 |
| commit | f9f6f41bff2213e199bded515e9b66d1e5c4d7dd (patch) | |
| tree | 29c5a75228e31f305f42c5b761709a186e406776 /pkgs/development/libraries | |
| parent | bbcf127c7c9029cba43493d7d25a9d1c65d59152 (diff) | |
| parent | 468f698f609e123bb0ffae67181d07ac99eb2204 (diff) | |
| download | nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.gz nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.bz2 nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.lz nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.xz nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.zst nixpkgs-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.zip | |
Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
Diffstat (limited to 'pkgs/development/libraries')
314 files changed, 2552 insertions, 4937 deletions
diff --git a/pkgs/development/libraries/accounts-qt/old.nix b/pkgs/development/libraries/accounts-qt/old.nix deleted file mode 100644 index 26a04362090..00000000000 --- a/pkgs/development/libraries/accounts-qt/old.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }: - -let version = "1.13"; in -stdenv.mkDerivation { - name = "accounts-qt-${version}"; - - src = fetchFromGitLab { - sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl"; - rev = version; - repo = "libaccounts-qt"; - owner = "accounts-sso"; - }; - - meta = with stdenv.lib; { - description = "Qt library for accessing the online accounts database"; - homepage = "http://code.google.com/p/accounts-sso/"; - license = licenses.lgpl21; - maintainers = with maintainers; [ nckx ]; - }; - - buildInputs = [ glib libaccounts-glib qt5.base ]; - nativeBuildInputs = [ doxygen pkgconfig ]; - - configurePhase = '' - qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake - ''; -} diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 38d734e902c..5af340bef07 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; # Note: Users should define the `ASPELL_CONF' environment variable to - # `dict-dir $HOME/.nix-profile/lib/aspell/' so that they can access + # `data-dir $HOME/.nix-profile/lib/aspell/' so that they can access # dictionaries installed in their profile. # # We can't use `$out/etc/aspell.conf' for that purpose since Aspell diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix index 2cb241b0427..e774a9e923b 100644 --- a/pkgs/development/libraries/despotify/default.nix +++ b/pkgs/development/libraries/despotify/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "http://svn.code.sf.net/p/despotify/code"; rev = "521"; + sha256 = "1vc453bv5ngkvaqkq7z5bj6x28m4kik59153jikcfah3k4qmxw21"; }; buildInputs = [ diff --git a/pkgs/development/libraries/fmod/4.24.16.nix b/pkgs/development/libraries/fmod/4.24.16.nix index d1768d656b4..b78b1a46e25 100644 --- a/pkgs/development/libraries/fmod/4.24.16.nix +++ b/pkgs/development/libraries/fmod/4.24.16.nix @@ -11,12 +11,12 @@ let src = (if (bits == "64") then fetchurl { - url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi42416linux64.tar.gz"; + url = "http://zandronum.com/essentials/fmod/fmodapi42416linux64.tar.gz"; sha256 = "0hkwlzchzzgd7fanqznbv5bs53z2qy8iiv9l2y77l4sg1jwmlm6y"; } else fetchurl { - url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi42416linux.tar.gz"; + url = "http://zandronum.com/essentials/fmod/fmodapi42416linux.tar.gz"; sha256 = "13diw3ax2slkr99mwyjyc62b8awc30k0z08cvkpk2p3i1j6f85m5"; } ); @@ -28,23 +28,26 @@ stdenv.mkDerivation rec { version = "4.24.16"; dontStrip = true; + dontPatchELF = true; + + makeFlags = [ "DESTLIBDIR=$(out)/lib" "DESTHDRDIR=$(out)/include" ]; + buildPhase = "true"; - installPhase = '' - mkdir -p $out/lib $out/include/fmodex - cd api/inc && cp * $out/include/fmodex && cd ../lib - cp libfmodex${bits}-${version}.so $out/lib/libfmodex.so - cp libfmodex${bits}L-${version}.so $out/lib/libfmodexL.so + preInstall = '' + mkdir -p $out/lib + ''; - ${patchLib "$out/lib/libfmodex.so"} - ${patchLib "$out/lib/libfmodexL.so"} + postInstall = '' + mv $out/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex.so + mv $out/lib/libfmodexp${bits}-${version}.so $out/lib/libfmodexp.so ''; - meta = { + meta = with stdenv.lib; { description = "Programming library and toolkit for the creation and playback of interactive audio"; homepage = "http://www.fmod.org/"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.lassulus ]; }; } diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 88545bf732c..73d3bb92e7e 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, intltool, pkgconfig, glib, json_glib, libsoup, geoip -, dbus, dbus_glib, networkmanager, modemmanager +, dbus, dbus_glib, modemmanager, avahi }: stdenv.mkDerivation rec { - name = "geoclue-2.1.10"; + name = "geoclue-2.4.1"; src = fetchurl { - url = "http://www.freedesktop.org/software/geoclue/releases/2.1/${name}.tar.xz"; - sha256 = "0s0ws2bx5g1cbjamxmm448r4n4crha2fwpzm8zbx6cq6qslygmzi"; + url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; + sha256 = "1m1l1npdv804m98xhfpd1wl1whrrp2pjivliwwlnyk86yq0gs6cs"; }; buildInputs = [ intltool pkgconfig glib json_glib libsoup geoip - dbus dbus_glib networkmanager modemmanager + dbus dbus_glib modemmanager avahi ]; preConfigure = '' diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index b32b126cfe8..cebcf4e014b 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -28,6 +28,12 @@ stdenv.mkDerivation (rec { "gt_cv_func_CFLocaleCopyCurrent=no" ]); + patchPhase = '' + substituteInPlace gettext-tools/projects/KDE/trigger --replace "/bin/pwd" pwd + substituteInPlace gettext-tools/projects/GNOME/trigger --replace "/bin/pwd" pwd + substituteInPlace gettext-tools/src/project-id --replace "/bin/pwd" pwd + ''; + # On cross building, gettext supposes that the wchar.h from libc # does not fulfill gettext needs, so it tries to work with its # own wchar.h file, which does not cope well with the system's @@ -90,8 +96,8 @@ stdenv.mkDerivation (rec { # Make sure `error.c' gets compiled and is part of `libgettextlib.la'. # This fixes: # gettext-0.18.1.1/gettext-tools/src/msgcmp.c:371: undefined reference to `_error_message_count' - - '' sed -i gettext-tools/gnulib-lib/Makefile.in \ + '' + sed -i gettext-tools/gnulib-lib/Makefile.in \ -e 's/am_libgettextlib_la_OBJECTS =/am_libgettextlib_la_OBJECTS = error.lo/g' ''; }) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 03881a41aa5..8a13cb6fe60 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -61,6 +61,8 @@ stdenv.mkDerivation ({ ./security-bdf1ff05.patch ./cve-2014-8121.patch ./cve-2015-1781.patch + + ./glibc-locale-incompatibility.patch ]; postPatch = diff --git a/pkgs/development/libraries/glibc/glibc-locale-incompatibility.patch b/pkgs/development/libraries/glibc/glibc-locale-incompatibility.patch new file mode 100644 index 00000000000..8ca2ce4cd88 --- /dev/null +++ b/pkgs/development/libraries/glibc/glibc-locale-incompatibility.patch @@ -0,0 +1,25 @@ +http://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/glibc-locale-incompatibility.patch + +This patch avoids an assertion failure when incompatible locale data +is encountered: + + https://sourceware.org/ml/libc-alpha/2015-09/msg00575.html + +--- glibc-2.22/locale/loadlocale.c 2015-09-22 17:16:02.321981548 +0200 ++++ glibc-2.22/locale/loadlocale.c 2015-09-22 17:17:34.814659064 +0200 +@@ -120,10 +120,11 @@ + _nl_value_type_LC_XYZ array. There are all pointers. */ + switch (category) + { +-#define CATTEST(cat) \ +- case LC_##cat: \ +- assert (cnt < (sizeof (_nl_value_type_LC_##cat) \ +- / sizeof (_nl_value_type_LC_##cat[0]))); \ ++#define CATTEST(cat) \ ++ case LC_##cat: \ ++ if (cnt >= (sizeof (_nl_value_type_LC_##cat) \ ++ / sizeof (_nl_value_type_LC_##cat[0]))) \ ++ goto puntdata; \ + break + CATTEST (NUMERIC); + CATTEST (TIME); diff --git a/pkgs/development/libraries/grantlee/5.x-old.nix b/pkgs/development/libraries/grantlee/5.x-old.nix deleted file mode 100644 index 4127280fb9a..00000000000 --- a/pkgs/development/libraries/grantlee/5.x-old.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, qt5, cmake }: - -stdenv.mkDerivation rec { - name = "grantlee-5.0.0"; - -# Upstream download server has country code firewall, so I made a mirror. - src = fetchurl { - urls = [ - "http://downloads.grantlee.org/${name}.tar.gz" - "http://www.loegria.net/grantlee/${name}.tar.gz" - ]; - sha256 = "0qdifp1sg87j3869xva5ai2d6d5ph7z4b85wv1fypf2k5sljpwpa"; - }; - - buildInputs = [ cmake qt5.base qt5.script ]; - - meta = { - description = "Qt5 port of Django template system"; - longDescription = '' - Grantlee is a plugin based String Template system written using the Qt - framework. The goals of the project are to make it easier for application - developers to separate the structure of documents from the data they - contain, opening the door for theming. - - The syntax is intended to follow the syntax of the Django template system, - and the design of Django is reused in Grantlee.''; - - homepage = http://gitorious.org/grantlee; - maintainers = [ stdenv.lib.maintainers.urkud ]; - inherit (qt5.base.meta) platforms; - }; -} diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix new file mode 100644 index 00000000000..ee505b54e7e --- /dev/null +++ b/pkgs/development/libraries/grib-api/default.nix @@ -0,0 +1,32 @@ +{ fetchurl, stdenv, curl, + netcdf, jasper, openjpeg }: + +stdenv.mkDerivation rec{ + name = "grib-api-${version}"; + version = "1.14.4"; + + src = fetchurl { + url = https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.14.4-Source.tar.gz; + sha256 = "1w8z9y79wakhwv1r4rb4dwlh9pbyw367klcm6laxz91hhvfrpfq8"; + }; + + buildInputs = [ netcdf + jasper + openjpeg + curl # Used for downloading during make test + ]; + doCheck = true; + + meta = with stdenv.lib; { + homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home"; + license = licenses.asl20; + description = "ECMWF Library for the GRIB file format"; + longDescription = '' + The ECMWF GRIB API is an application program interface accessible from C, + FORTRAN and Python programs developed for encoding and decoding WMO FM-92 + GRIB edition 1 and edition 2 messages. + ''; + + }; +} + diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 25f530ecfef..44e52b99d71 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx , libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc -, glib, gstreamer, bzip2, libsoup, libintlOrEmpty, ncurses +, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintlOrEmpty , # Whether to build no plugins that have external dependencies # (except the PulseAudio plugin). minimalDeps ? false @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ++ libintlOrEmpty ++ stdenv.lib.optionals (!minimalDeps) [ aalib libcaca cairo libdv flac libjpeg libpng speex - taglib bzip2 libvpx gdk_pixbuf orc libsoup ]; + taglib bzip2 libvpx gdk_pixbuf orc libsoup libshout ]; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 99ac5a5ec54..8e4e662dc3b 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base -, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, libintlOrEmpty }: +, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintlOrEmpty }: stdenv.mkDerivation rec { name = "gst-plugins-ugly-0.10.19"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ] ++ libintlOrEmpty; + [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix new file mode 100644 index 00000000000..daa4f7fb9f2 --- /dev/null +++ b/pkgs/development/libraries/hyena/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp, monoDLLFixer }: + +stdenv.mkDerivation rec { + name = "hyena-${version}"; + version = "0.5"; + + src = fetchurl { + url = "mirror://gnome/sources/hyena/${version}/hyena-${version}.tar.bz2" ; + sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9"; + }; + + buildInputs = [ + pkgconfig mono gtk-sharp + ]; + + postPatch = '' + patchShebangs build/dll-map-makefile-verifier + patchShebangs build/private-icon-theme-installer + find -name Makefile.in | xargs -n 1 -d '\n' sed -e 's/^dnl/#/' -i + ''; + + preConfigure = '' + substituteInPlace configure --replace gmcs mcs + ''; + + dontStrip = true; + + inherit monoDLLFixer; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Hyena; + description = "A C# library which contains a hodge-podge of random stuff"; + longDescription = '' + Hyena is a C# library used to make awesome applications. It contains a lot of random things, + including useful data structures, a Sqlite-based db layer, cool widgets, a JSON library, + a smart job/task scheduler, a user-query/search parser, and much more. It's particularly + useful for Gtk# applications, though only the Hyena.Gui assembly requires Gtk#. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ obadz ]; + }; +} diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index 508b188aef7..4576c1a1c72 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://github.com/zeromq/jzmq.git; rev = "946fd39780423b2df6e5efd9fa2cd863fd79c9db"; + sha256 = "0j6kfmngqw2gpyxc1ak67d65l208vrb0h8bm8svclia8b339m37a"; }; buildInputs = [ automake autoconf libtool pkgconfig zeromq2 jdk ]; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 74aa8c9ba16..87958512925 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { name = "rhino-${version}"; src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip"; + url = "https://ftp.mozilla.org/pub/js/rhino1_7R2.zip"; sha256 = "1p32hkghi6bkc3cf2dcqyaw5cjj7403mykcp0fy8f5bsnv0pszv7"; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/default.nix deleted file mode 100644 index 6b6b95ab3c7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -# Maintainer's Notes: -# -# How To Update -# 1. Edit the URL in ./manifest.sh -# 2. Run ./manifest.sh -# 3. Fix build errors. - -{ pkgs, debug ? false }: - -let - - inherit (pkgs) lib makeSetupHook stdenv; - - mirror = "mirror://kde"; - srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; - - kdeFramework = args: - let - inherit (args) name; - inherit (srcs."${name}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); - }); - - addPackages = self: with self; { - attica = callPackage ./attica.nix {}; - baloo = callPackage ./baloo.nix {}; - bluez-qt = callPackage ./bluez-qt.nix {}; - extra-cmake-modules = callPackage ./extra-cmake-modules {}; - frameworkintegration = callPackage ./frameworkintegration.nix {}; - kactivities = callPackage ./kactivities.nix {}; - kapidox = callPackage ./kapidox.nix {}; - karchive = callPackage ./karchive.nix {}; - kauth = callPackage ./kauth {}; - kbookmarks = callPackage ./kbookmarks.nix {}; - kcmutils = callPackage ./kcmutils {}; - kcodecs = callPackage ./kcodecs.nix {}; - kcompletion = callPackage ./kcompletion.nix {}; - kconfig = callPackage ./kconfig.nix {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; - kcoreaddons = callPackage ./kcoreaddons.nix {}; - kcrash = callPackage ./kcrash.nix {}; - kdbusaddons = callPackage ./kdbusaddons.nix {}; - kdeclarative = callPackage ./kdeclarative.nix {}; - kded = callPackage ./kded.nix {}; - kdelibs4support = callPackage ./kdelibs4support.nix {}; - kdesignerplugin = callPackage ./kdesignerplugin.nix {}; - kdewebkit = callPackage ./kdewebkit.nix {}; - kdesu = callPackage ./kdesu.nix {}; - kdnssd = callPackage ./kdnssd.nix {}; - kdoctools = callPackage ./kdoctools {}; - kemoticons = callPackage ./kemoticons.nix {}; - kfilemetadata = callPackage ./kfilemetadata.nix {}; - kglobalaccel = callPackage ./kglobalaccel.nix {}; - kguiaddons = callPackage ./kguiaddons.nix {}; - khtml = callPackage ./khtml.nix {}; - ki18n = callPackage ./ki18n.nix {}; - kiconthemes = callPackage ./kiconthemes.nix {}; - kidletime = callPackage ./kidletime.nix {}; - kimageformats = callPackage ./kimageformats.nix {}; - kinit = callPackage ./kinit {}; - kio = callPackage ./kio.nix {}; - kitemmodels = callPackage ./kitemmodels.nix {}; - kitemviews = callPackage ./kitemviews.nix {}; - kjobwidgets = callPackage ./kjobwidgets.nix {}; - kjs = callPackage ./kjs.nix {}; - kjsembed = callPackage ./kjsembed.nix {}; - kmediaplayer = callPackage ./kmediaplayer.nix {}; - knewstuff = callPackage ./knewstuff.nix {}; - knotifications = callPackage ./knotifications.nix {}; - knotifyconfig = callPackage ./knotifyconfig.nix {}; - kpackage = callPackage ./kpackage {}; - kparts = callPackage ./kparts.nix {}; - kpeople = callPackage ./kpeople.nix {}; - kplotting = callPackage ./kplotting.nix {}; - kpty = callPackage ./kpty.nix {}; - kross = callPackage ./kross.nix {}; - krunner = callPackage ./krunner.nix {}; - kservice = callPackage ./kservice {}; - ktexteditor = callPackage ./ktexteditor {}; - ktextwidgets = callPackage ./ktextwidgets.nix {}; - kunitconversion = callPackage ./kunitconversion.nix {}; - kwallet = callPackage ./kwallet.nix {}; - kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; - kwindowsystem = callPackage ./kwindowsystem.nix {}; - kxmlgui = callPackage ./kxmlgui.nix {}; - kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; - modemmanager-qt = callPackage ./modemmanager-qt.nix {}; - networkmanager-qt = callPackage ./networkmanager-qt.nix {}; - plasma-framework = callPackage ./plasma-framework {}; - solid = callPackage ./solid.nix {}; - sonnet = callPackage ./sonnet.nix {}; - threadweaver = callPackage ./threadweaver.nix {}; - }; - - newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope); - -in lib.makeScope newScope addPackages diff --git a/pkgs/development/libraries/kde-frameworks-5.15/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.15/fetchsrcs.sh deleted file mode 100755 index e7f6d9e00e5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/fetchsrcs.sh +++ /dev/null @@ -1,57 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils findutils gnused nix wget - -set -x - -# The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/frameworks/5.15/" -EXTRA_WGET_ARGS='-A *.tar.xz' - -mkdir tmp; cd tmp - -rm -f ../srcs.csv - -wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS - -find . | while read src; do - if [[ -f "${src}" ]]; then - # Sanitize file name - filename=$(basename "$src" | tr '@' '_') - nameVersion="${filename%.tar.*}" - name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') - version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') - echo "$name,$version,$src,$filename" >>../srcs.csv - fi -done - -cat >../srcs.nix <<EOF -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ -EOF - -gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do - versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv) - latestVersion=$(echo "$versions" | sort -rV | head -n 1) - src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv) - filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv) - url="${src:2}" - sha256=$(nix-hash --type sha256 --base32 --flat "$src") - cat >>../srcs.nix <<EOF - $name = { - version = "$latestVersion"; - src = fetchurl { - url = "\${mirror}/$url"; - sha256 = "$sha256"; - name = "$filename"; - }; - }; -EOF -done - -echo "}" >>../srcs.nix - -rm -f ../srcs.csv - -cd .. diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcoreaddons.nix deleted file mode 100644 index 43c21bb51ef..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcoreaddons.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, shared_mime_info -}: - -kdeFramework { - name = "kcoreaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ shared_mime_info ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdesignerplugin.nix deleted file mode 100644 index 28df2415320..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdesignerplugin.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdewebkit -, kdoctools -, kiconthemes -, kio -, kitemviews -, kplotting -, ktextwidgets -, kwidgetsaddons -, kxmlgui -, sonnet -}: - -kdeFramework { - name = "kdesignerplugin"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit - kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons - kxmlgui - ]; - propagatedBuildInputs = [ kio sonnet ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.15/ki18n.nix deleted file mode 100644 index 915e3294b46..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/ki18n.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, gettext -, python -, qtscript -}: - -kdeFramework { - name = "ki18n"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtscript ]; - propagatedNativeBuildInputs = [ gettext python ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix deleted file mode 100644 index 02b516afedc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets, ki18n -, kitemviews, qtsvg -}: - -kdeFramework { - name = "kiconthemes"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfigwidgets kitemviews qtsvg ]; - propagatedBuildInputs = [ ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kio.nix b/pkgs/development/libraries/kde-frameworks-5.15/kio.nix deleted file mode 100644 index 0789828d812..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kio.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, acl, karchive -, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews -, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet -, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper -, qtscript, qtx11extras, solid -}: - -kdeFramework { - name = "kio"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - acl karchive kconfig kcoreaddons kdbusaddons kiconthemes - knotifications ktextwidgets kwallet kwidgetsaddons - qtscript - ]; - propagatedBuildInputs = [ - kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets - kservice kwindowsystem kxmlgui solid qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/kcookiejar5" - wrapQtProgram "$out/bin/ktelnetservice5" - wrapQtProgram "$out/bin/ktrash5" - wrapQtProgram "$out/bin/kmailservice5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.15/kxmlgui.nix deleted file mode 100644 index b3b8b39932d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kxmlgui.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, attica, kconfig -, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews -, ktextwidgets, kwindowsystem, sonnet -}: - -kdeFramework { - name = "kxmlgui"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - attica kconfig kconfigwidgets kiconthemes kitemviews - ktextwidgets - ]; - propagatedBuildInputs = [ kglobalaccel ki18n kwindowsystem sonnet ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.15/srcs.nix deleted file mode 100644 index fd4998c49ba..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/srcs.nix +++ /dev/null @@ -1,549 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - attica = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/attica-5.15.0.tar.xz"; - sha256 = "0gddapcl2m5gds8f341z0954qlllx22xbd51649lri429aw2ijcl"; - name = "attica-5.15.0.tar.xz"; - }; - }; - baloo = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/baloo-5.15.0.tar.xz"; - sha256 = "10qwxljzhl8wagfmvdbrmqlzk68jkrp703d232fr7gvz3qrmdpbz"; - name = "baloo-5.15.0.tar.xz"; - }; - }; - bluez-qt = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/bluez-qt-5.15.0.tar.xz"; - sha256 = "15k242ifj3mfy0g0v7h504zn07cvahc70whc6n9yr0091j1azf5f"; - name = "bluez-qt-5.15.0.tar.xz"; - }; - }; - extra-cmake-modules = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/extra-cmake-modules-5.15.0.tar.xz"; - sha256 = "1g02dcbx1r0n2skrhmc6d3pckqvbii7ai91chlkwcdd8vzd4lgcg"; - name = "extra-cmake-modules-5.15.0.tar.xz"; - }; - }; - frameworkintegration = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/frameworkintegration-5.15.0.tar.xz"; - sha256 = "06sacinx3g3hrs11v67k7j8ddp5swasjrw6x36ng3mr81i2ksyia"; - name = "frameworkintegration-5.15.0.tar.xz"; - }; - }; - kactivities = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kactivities-5.15.0.tar.xz"; - sha256 = "0h9f78f8r5z5jarxph168h1m0zvz2zhd8iq6gc9sg09044xn1lnq"; - name = "kactivities-5.15.0.tar.xz"; - }; - }; - kapidox = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kapidox-5.15.0.tar.xz"; - sha256 = "1342j7459rafz1ns0nnlh1i65c05cd6l3c4sh1j75qgl0pjnrvcq"; - name = "kapidox-5.15.0.tar.xz"; - }; - }; - karchive = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/karchive-5.15.0.tar.xz"; - sha256 = "1s5mggi0vydg9w589qk4fp4qbhj7h9wcczn6k7j41bcqdapxzdfh"; - name = "karchive-5.15.0.tar.xz"; - }; - }; - kauth = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kauth-5.15.0.tar.xz"; - sha256 = "1nhrfbfasmg8a9gj94ri5qcvrdhhb204miv3i5y59ma09hd1xag2"; - name = "kauth-5.15.0.tar.xz"; - }; - }; - kbookmarks = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kbookmarks-5.15.0.tar.xz"; - sha256 = "1y21679a37lspwf02vy687k5najap18x7hxd8k8hssdivjvg43z8"; - name = "kbookmarks-5.15.0.tar.xz"; - }; - }; - kcmutils = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kcmutils-5.15.0.tar.xz"; - sha256 = "0syk030b89z90aa85d1mlag613yaajipgfxxfxnp3f488s54qn6z"; - name = "kcmutils-5.15.0.tar.xz"; - }; - }; - kcodecs = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kcodecs-5.15.0.tar.xz"; - sha256 = "1kz8vbxblzf0lxcn6c2433lhgi2iyvqsm65qxsvf5zgxckq5277p"; - name = "kcodecs-5.15.0.tar.xz"; - }; - }; - kcompletion = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kcompletion-5.15.0.tar.xz"; - sha256 = "1mq110fg30y3xdmjicckysz3k5ylz92hz609ffjnm2svk56w5cny"; - name = "kcompletion-5.15.0.tar.xz"; - }; - }; - kconfig = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kconfig-5.15.0.tar.xz"; - sha256 = "083g4pr5sbqvpdn3ic3afbjzvczxl095rj0pi34g2b28anpwhjvn"; - name = "kconfig-5.15.0.tar.xz"; - }; - }; - kconfigwidgets = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kconfigwidgets-5.15.0.tar.xz"; - sha256 = "0gkq7ifgyf7865ypxf4cwqkndn4qrp07k8wxp8fl0xa15d74nrj3"; - name = "kconfigwidgets-5.15.0.tar.xz"; - }; - }; - kcoreaddons = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kcoreaddons-5.15.0.tar.xz"; - sha256 = "1v06bblxrxcwj9sbsz7xvqq6yg231m939pms8w0bbmyidsq4vpdm"; - name = "kcoreaddons-5.15.0.tar.xz"; - }; - }; - kcrash = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kcrash-5.15.0.tar.xz"; - sha256 = "1631wmg895bb4ls2mfxnlnffmzl1mjm82ad8fk361gv0s9g0xb3y"; - name = "kcrash-5.15.0.tar.xz"; - }; - }; - kdbusaddons = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdbusaddons-5.15.0.tar.xz"; - sha256 = "1w32ra4ifhb2k2k2j3dfqrrc65w0rsmj9yr34k0flqiqs0mq1pfx"; - name = "kdbusaddons-5.15.0.tar.xz"; - }; - }; - kdeclarative = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdeclarative-5.15.0.tar.xz"; - sha256 = "06xv552v52zp9qb5v6w3cps9nm3wpacpjvm8s08zmij1y7by0z32"; - name = "kdeclarative-5.15.0.tar.xz"; - }; - }; - kded = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kded-5.15.0.tar.xz"; - sha256 = "144lfjx6gmbhqqwdv4ll1ab4rj3pcyn8bp9yp4snzh6v2a2hncwq"; - name = "kded-5.15.0.tar.xz"; - }; - }; - kdelibs4support = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/kdelibs4support-5.15.0.tar.xz"; - sha256 = "1091nc3rrcq360sillynvmxwvmd209cnlql6g9x249zdxjpv62qy"; - name = "kdelibs4support-5.15.0.tar.xz"; - }; - }; - kdesignerplugin = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdesignerplugin-5.15.0.tar.xz"; - sha256 = "0my6x0fx72dk65z6lajn1faxifc622msvll6jab0rk50x8ws9dwq"; - name = "kdesignerplugin-5.15.0.tar.xz"; - }; - }; - kdesu = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdesu-5.15.0.tar.xz"; - sha256 = "0cnqd0gm5xyqsqngl0x6rs0f01bilcfv8xx1ry9hfnqffv9amr9y"; - name = "kdesu-5.15.0.tar.xz"; - }; - }; - kdewebkit = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdewebkit-5.15.0.tar.xz"; - sha256 = "1cgwhb5nr6g6y3azp2ii0hdjlvwacdr94ldlsirqmzl7rymkgkqa"; - name = "kdewebkit-5.15.0.tar.xz"; - }; - }; - kdnssd = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdnssd-5.15.0.tar.xz"; - sha256 = "1z5d26pmc9vmf30zz35kcl585fpjfrp8xf5r13lfwnnbfr6pnh0k"; - name = "kdnssd-5.15.0.tar.xz"; - }; - }; - kdoctools = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdoctools-5.15.0.tar.xz"; - sha256 = "0vci37val64ixcz7zr99gzdqlb0ff04gdj2kad5dj32295iixhva"; - name = "kdoctools-5.15.0.tar.xz"; - }; - }; - kemoticons = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kemoticons-5.15.0.tar.xz"; - sha256 = "0a3izq6w3w37qd6b6w2g179w9nrh5pwh8hnc4iggyr2wwf2hfw9c"; - name = "kemoticons-5.15.0.tar.xz"; - }; - }; - kfilemetadata = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kfilemetadata-5.15.0.tar.xz"; - sha256 = "1y90azm27mnw2wfilwmg1gls21fpnd2nzvdl26vrhpsvnclf8rqn"; - name = "kfilemetadata-5.15.0.tar.xz"; - }; - }; - kglobalaccel = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kglobalaccel-5.15.0.tar.xz"; - sha256 = "1ii7bd1rf038zjimz7nd2snfi76drqdnyrkivwd6np4fdvcsyhjr"; - name = "kglobalaccel-5.15.0.tar.xz"; - }; - }; - kguiaddons = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kguiaddons-5.15.0.tar.xz"; - sha256 = "0pfcns136i0ghk32gyr7nnq7wnk2j8rmcr3jr18f1y9pkk3ih6q8"; - name = "kguiaddons-5.15.0.tar.xz"; - }; - }; - khtml = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/khtml-5.15.0.tar.xz"; - sha256 = "01gx1qd7hhvyhzndin8kw9yg3jlz8rz7i8kxbl6wpab9sc270a70"; - name = "khtml-5.15.0.tar.xz"; - }; - }; - ki18n = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/ki18n-5.15.0.tar.xz"; - sha256 = "0qy7nv4ssjbyskjhnx8sr6vg9jwg183f6zd759rzp56pz5j79qdd"; - name = "ki18n-5.15.0.tar.xz"; - }; - }; - kiconthemes = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kiconthemes-5.15.0.tar.xz"; - sha256 = "0ab9iki3jl4izzjph9bps04w7grimyyaaxsna6j0dzg90izg1zg2"; - name = "kiconthemes-5.15.0.tar.xz"; - }; - }; - kidletime = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kidletime-5.15.0.tar.xz"; - sha256 = "0gp6grv6a9zb14yfrznwn5ih1946v500zlj5g9s8f1xw5p0792i2"; - name = "kidletime-5.15.0.tar.xz"; - }; - }; - kimageformats = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kimageformats-5.15.0.tar.xz"; - sha256 = "0q66w91khj4xax4nzak5r9wmr0qny5cq7dapv11zdzn7rf90bpvv"; - name = "kimageformats-5.15.0.tar.xz"; - }; - }; - kinit = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kinit-5.15.0.tar.xz"; - sha256 = "0ccf2rg6m74xj7mq4i0fsl09l2wkwyhmlfp3lvrn4714w19bj5yf"; - name = "kinit-5.15.0.tar.xz"; - }; - }; - kio = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kio-5.15.0.tar.xz"; - sha256 = "0ld56arcjms5kiz9zj3g7hgd6xq05zg2bx0qpr4aaihl3hgp6888"; - name = "kio-5.15.0.tar.xz"; - }; - }; - kitemmodels = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kitemmodels-5.15.0.tar.xz"; - sha256 = "112a8mdxabzv7lhpxfnnz2jrib972lz6ww7gd92lqziprz78fyga"; - name = "kitemmodels-5.15.0.tar.xz"; - }; - }; - kitemviews = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kitemviews-5.15.0.tar.xz"; - sha256 = "1112x7lf0wvwsizcr2ij0w463cssg0ahcav872g39gzirf67lqyi"; - name = "kitemviews-5.15.0.tar.xz"; - }; - }; - kjobwidgets = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kjobwidgets-5.15.0.tar.xz"; - sha256 = "12r3j1bwvmacj70dng4g5yrgjgj4v8nizk4yf22dfy858k8v8zda"; - name = "kjobwidgets-5.15.0.tar.xz"; - }; - }; - kjs = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/kjs-5.15.0.tar.xz"; - sha256 = "1aj9w8009q8bdq17ckjr1z219qy4wkjwc5xggl1879haqxn1pfg3"; - name = "kjs-5.15.0.tar.xz"; - }; - }; - kjsembed = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/kjsembed-5.15.0.tar.xz"; - sha256 = "099m6k6m6imy7jdia822i1g6c61gp955w21m4bb5nndwdy580mj4"; - name = "kjsembed-5.15.0.tar.xz"; - }; - }; - kmediaplayer = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/kmediaplayer-5.15.0.tar.xz"; - sha256 = "1rli98klmizwmmwwn6lcna7vxihd7b5yrvshisw6ivb21ygjgrxm"; - name = "kmediaplayer-5.15.0.tar.xz"; - }; - }; - knewstuff = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/knewstuff-5.15.0.tar.xz"; - sha256 = "0s8ha0qqy007kq1k55mii5msbqxnczb57xici3in1idxjd83fjnw"; - name = "knewstuff-5.15.0.tar.xz"; - }; - }; - knotifications = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/knotifications-5.15.0.tar.xz"; - sha256 = "1189xx9a5i932lfyniqnz43gl3hhjlg962j996zy0g9yasc2r3cm"; - name = "knotifications-5.15.0.tar.xz"; - }; - }; - knotifyconfig = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/knotifyconfig-5.15.0.tar.xz"; - sha256 = "0b279z1qwfhj2mnpil0jd3xs8yn4i8mvib8dws6q4nygl941b8sa"; - name = "knotifyconfig-5.15.0.tar.xz"; - }; - }; - kpackage = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kpackage-5.15.0.tar.xz"; - sha256 = "03zcnqly2pb67pza9xm9n0asjixqicxwj5vnv25yvki02cgwmvn3"; - name = "kpackage-5.15.0.tar.xz"; - }; - }; - kparts = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kparts-5.15.0.tar.xz"; - sha256 = "0pjfmb97387kvvn7c4xzmxdja2jghx946ima5g8jnfw0zacsd2mw"; - name = "kparts-5.15.0.tar.xz"; - }; - }; - kpeople = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kpeople-5.15.0.tar.xz"; - sha256 = "11frmba6rqn2bmqp28wrwrqw8lpkdg27v5fa5lg47vrdp4ih0rgs"; - name = "kpeople-5.15.0.tar.xz"; - }; - }; - kplotting = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kplotting-5.15.0.tar.xz"; - sha256 = "0wwqlza0qfd25p9d5gfrs0ymwzg5b0lnb4b8slfw2znazvi03krj"; - name = "kplotting-5.15.0.tar.xz"; - }; - }; - kpty = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kpty-5.15.0.tar.xz"; - sha256 = "03yl4kwhwma0nwbgww95z4853waxrq4xipy41k7224n3gvd62c30"; - name = "kpty-5.15.0.tar.xz"; - }; - }; - kross = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/kross-5.15.0.tar.xz"; - sha256 = "1mlvs0ra3ngrmrmqb4qjg3nkw5hqscdd1p3cdh94mpcwk330svq0"; - name = "kross-5.15.0.tar.xz"; - }; - }; - krunner = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/krunner-5.15.0.tar.xz"; - sha256 = "0kyb135a45b9si4xh7pml7aiigs3j5077dgjfrghhz0ci3ibmn0v"; - name = "krunner-5.15.0.tar.xz"; - }; - }; - kservice = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kservice-5.15.0.tar.xz"; - sha256 = "13yfg99s7k7y2npj8jn12iikan95dsf8hdmqfjb59n5qg4a6h253"; - name = "kservice-5.15.0.tar.xz"; - }; - }; - ktexteditor = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/ktexteditor-5.15.0.tar.xz"; - sha256 = "161kkssai0lwssy6l4mxgclx7229bgfkfgsf973i94p6hanaymb8"; - name = "ktexteditor-5.15.0.tar.xz"; - }; - }; - ktextwidgets = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/ktextwidgets-5.15.0.tar.xz"; - sha256 = "1r9drjjlag5v7y8inswbrj2fmkzkranrnzyrwl4bl7v0l1dir2l8"; - name = "ktextwidgets-5.15.0.tar.xz"; - }; - }; - kunitconversion = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kunitconversion-5.15.0.tar.xz"; - sha256 = "1qbps67w3ii2797q967wvy56zclsm9l6vcrwnylx9rfqygcs5ixf"; - name = "kunitconversion-5.15.0.tar.xz"; - }; - }; - kwallet = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kwallet-5.15.0.tar.xz"; - sha256 = "1b97v4vad7lzrjmf04zikm4q9czyzbzkk3vdhcd2mi47vizrj392"; - name = "kwallet-5.15.0.tar.xz"; - }; - }; - kwidgetsaddons = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kwidgetsaddons-5.15.0.tar.xz"; - sha256 = "1nbgsf5dfz0f12azw19ir7791y6ykkkj7y96ln0k81d3cbcgxq63"; - name = "kwidgetsaddons-5.15.0.tar.xz"; - }; - }; - kwindowsystem = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kwindowsystem-5.15.0.tar.xz"; - sha256 = "1x8pagby6j7k2ns3davbmyysggril0kp9ccn3326qm89l70zrf8x"; - name = "kwindowsystem-5.15.0.tar.xz"; - }; - }; - kxmlgui = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kxmlgui-5.15.0.tar.xz"; - sha256 = "1d5mm2fkzk92q9gfh76a83mbzqw2pcagkg6s51i5ax3zqb7jnzdm"; - name = "kxmlgui-5.15.0.tar.xz"; - }; - }; - kxmlrpcclient = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kxmlrpcclient-5.15.0.tar.xz"; - sha256 = "03ckqn33djzyg0ik9g1jk4dj33incsxwvvdc7g5k8wjgjcdkp433"; - name = "kxmlrpcclient-5.15.0.tar.xz"; - }; - }; - modemmanager-qt = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/modemmanager-qt-5.15.0.tar.xz"; - sha256 = "1sxi32jxsz3d51nkcx7wxjyjvr2fg3qay3s3nzrpdzm0pa79drr9"; - name = "modemmanager-qt-5.15.0.tar.xz"; - }; - }; - networkmanager-qt = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/networkmanager-qt-5.15.0.tar.xz"; - sha256 = "0l0396c9fgwxdv1h33p7y8w0ylvm4pa3a53yv7jckkc49nygk38p"; - name = "networkmanager-qt-5.15.0.tar.xz"; - }; - }; - plasma-framework = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/plasma-framework-5.15.0.tar.xz"; - sha256 = "0v36i64jb3n6lq964417lzbdm6m57nvg83kjli4wqlc17dywjp8s"; - name = "plasma-framework-5.15.0.tar.xz"; - }; - }; - solid = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/solid-5.15.0.tar.xz"; - sha256 = "0118bynfqcgvg333ljbb80k7bkam6skc7vygwvy7fr7y4dzmlwfa"; - name = "solid-5.15.0.tar.xz"; - }; - }; - sonnet = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/sonnet-5.15.0.tar.xz"; - sha256 = "18qs5szdyvjzwlbid62g3qs7cs4fdb46n25aw49saq7drf567gm0"; - name = "sonnet-5.15.0.tar.xz"; - }; - }; - threadweaver = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/threadweaver-5.15.0.tar.xz"; - sha256 = "19ha9r6wjm93w4kh5rjaal0r91vxhsr9q82dw5b9j927zrqwb7pq"; - name = "threadweaver-5.15.0.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/attica.nix b/pkgs/development/libraries/kde-frameworks-5.16/attica.nix deleted file mode 100644 index 98721876c12..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/attica.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "attica"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.16/baloo.nix deleted file mode 100644 index 38c41d9271d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/baloo.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig -, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime -, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid -}: - -kdeFramework { - name = "baloo"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - kconfig kcrash kdbusaddons lmdb qtquick1 solid - ]; - propagatedBuildInputs = [ - kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase - ]; - postInstall = '' - wrapQtProgram "$out/bin/baloo_file" - wrapQtProgram "$out/bin/baloo_file_extractor" - wrapQtProgram "$out/bin/balooctl" - wrapQtProgram "$out/bin/baloosearch" - wrapQtProgram "$out/bin/balooshow" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.16/bluez-qt.nix deleted file mode 100644 index f981b0516f7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/bluez-qt.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtdeclarative -}: - -kdeFramework { - name = "bluez-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtdeclarative ]; - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /lib/udev/rules.d "$out/lib/udev/rules.d" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/0001-extra-cmake-modules-paths.patch deleted file mode 100644 index 9717716faf5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/0001-extra-cmake-modules-paths.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Fri, 20 Feb 2015 23:17:39 -0600 -Subject: [PATCH] extra-cmake-modules paths - ---- - kde-modules/KDEInstallDirs.cmake | 37 ++++--------------------------------- - 1 file changed, 4 insertions(+), 33 deletions(-) - -diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index b7cd34d..2f868ac 100644 ---- a/kde-modules/KDEInstallDirs.cmake -+++ b/kde-modules/KDEInstallDirs.cmake -@@ -193,37 +193,8 @@ - # (To distribute this file outside of extra-cmake-modules, substitute the full - # License text for the above reference.) - --# Figure out what the default install directory for libraries should be. --# This is based on the logic in GNUInstallDirs, but simplified (the --# GNUInstallDirs code deals with re-configuring, but that is dealt with --# by the _define_* macros in this module). -+# The default library directory on NixOS is *always* /lib. - set(_LIBDIR_DEFAULT "lib") --# Override this default 'lib' with 'lib64' iff: --# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling --# - we are NOT on debian --# - we are on a 64 bits system --# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf --# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if --# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See http://wiki.debian.org/Multiarch --if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -- AND NOT CMAKE_CROSSCOMPILING) -- if (EXISTS "/etc/debian_version") # is this a debian system ? -- if(CMAKE_LIBRARY_ARCHITECTURE) -- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") -- endif() -- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: -- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) -- message(AUTHOR_WARNING -- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " -- "Please enable at least one language before including KDEInstallDirs.") -- else() -- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -- set(_LIBDIR_DEFAULT "lib64") -- endif() -- endif() -- endif() --endif() - - set(_gnu_install_dirs_vars - BINDIR -@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) - "QtQuick2 imports" - QML_INSTALL_DIR) - else() -- _define_relative(QTPLUGINDIR LIBDIR "plugins" -+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" - "Qt plugins" - QT_PLUGIN_INSTALL_DIR) - -- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" -+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports" - "QtQuick1 imports" - IMPORTS_INSTALL_DIR) - -- _define_relative(QMLDIR LIBDIR "qml" -+ _define_relative(QMLDIR LIBDIR "qt5/qml" - "QtQuick2 imports" - QML_INSTALL_DIR) - endif() --- -2.3.0 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/default.nix deleted file mode 100644 index 4e1b1aff3bd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }: - -kdeFramework { - name = "extra-cmake-modules"; - patches = [ ./0001-extra-cmake-modules-paths.patch ]; - - setupHook = ./setup-hook.sh; - - # It is OK to propagate these inputs as long as - # extra-cmake-modules is never a propagated input - # of some other derivation. - propagatedNativeBuildInputs = [ cmake pkgconfig qttools ]; - - meta = { - license = stdenv.lib.licenses.bsd2; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/setup-hook.sh deleted file mode 100644 index a6fa6189240..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/setup-hook.sh +++ /dev/null @@ -1,27 +0,0 @@ -addMimePkg() { - local propagated - - if [[ -d "$1/share/mime" ]]; then - propagated= - for pkg in $propagatedBuildInputs; do - if [[ "z$pkg" == "z$1" ]]; then - propagated=1 - fi - done - if [[ -z $propagated ]]; then - propagatedBuildInputs="$propagatedBuildInputs $1" - fi - - propagated= - for pkg in $propagatedUserEnvPkgs; do - if [[ "z$pkg" == "z$1" ]]; then - propagated=1 - fi - done - if [[ -z $propagated ]]; then - propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" - fi - fi -} - -envHooks+=(addMimePkg) diff --git a/pkgs/development/libraries/kde-frameworks-5.16/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.16/frameworkintegration.nix deleted file mode 100644 index 26987c385ad..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/frameworkintegration.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion -, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications -, kwidgetsaddons, libXcursor, qtx11extras -}: - -kdeFramework { - name = "frameworkintegration"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kbookmarks kcompletion kconfig knotifications kwidgetsaddons - libXcursor - ]; - propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.16/kactivities.nix deleted file mode 100644 index 3225098f439..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kactivities.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig -, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n -, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative -}: - -kdeFramework { - name = "kactivities"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - boost kcmutils kconfig kcoreaddons kdbusaddons kservice - kxmlgui - ]; - propagatedBuildInputs = [ - kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative - ]; - postInstall = '' - wrapQtProgram "$out/bin/kactivitymanagerd" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.16/kapidox.nix deleted file mode 100644 index 647be8f052c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kapidox.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, python -}: - -kdeFramework { - name = "kapidox"; - nativeBuildInputs = [ extra-cmake-modules python ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.16/karchive.nix deleted file mode 100644 index a8d9a0003c3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/karchive.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "karchive"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kauth/default.nix deleted file mode 100644 index 42a10019334..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kauth/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, polkitQt -}: - -kdeFramework { - name = "kauth"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ polkitQt ]; - propagatedBuildInputs = [ kcoreaddons ]; - patches = [ ./kauth-policy-install.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.16/kauth/kauth-policy-install.patch deleted file mode 100644 index 340155256f2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kauth/kauth-policy-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in -index e859ec7..9a8ab18 100644 ---- a/KF5AuthConfig.cmake.in -+++ b/KF5AuthConfig.cmake.in -@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") - - set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") - set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") --set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") -+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") - set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") - - find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.16/kbookmarks.nix deleted file mode 100644 index 1a469ab4db6..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kbookmarks.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcodecs -, kconfig -, kconfigwidgets -, kcoreaddons -, kiconthemes -, kxmlgui -}: - -kdeFramework { - name = "kbookmarks"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs - kconfig - kconfigwidgets - kcoreaddons - kiconthemes - kxmlgui - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.16/kcmutils/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 0d861fa9501..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcmutils/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 06:43:53 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - src/kpluginselector.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index 9c3431d..d6b1ee2 100644 ---- a/src/kpluginselector.cpp -+++ b/src/kpluginselector.cpp -@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName, - QStringList desktopFileNames; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - desktopFileNames.append(it.next()); - } --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcmutils/default.nix deleted file mode 100644 index dbbb783ac61..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcmutils/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets -, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews -, kpackage, kservice, kxmlgui -}: - -kdeFramework { - name = "kcmutils"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons kiconthemes kitemviews kpackage kxmlgui - ]; - propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcodecs.nix deleted file mode 100644 index 53a69a69b69..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcodecs.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kcodecs"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcompletion.nix deleted file mode 100644 index e393774f16a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcompletion.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kwidgetsaddons -}: - -kdeFramework { - name = "kcompletion"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kwidgetsaddons ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.16/kconfig.nix deleted file mode 100644 index e132afe5988..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kconfig.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, makeQtWrapper -}: - -kdeFramework { - name = "kconfig"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - postInstall = '' - wrapQtProgram "$out/bin/kreadconfig5" - wrapQtProgram "$out/bin/kwriteconfig5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 7a6c0ee9053..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 06:47:01 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - src/khelpclient.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index 53a331e..80fbb01 100644 ---- a/src/khelpclient.cpp -+++ b/src/khelpclient.cpp -@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) - QString docPath; - const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - Q_FOREACH (const QString &dir, desktopDirs) { -- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString desktopPath(it.next()); - KDesktopFile desktopFile(desktopPath); --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/default.nix deleted file mode 100644 index 0e14d06edd3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig -, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper -}: - -kdeFramework { - name = "kconfigwidgets"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ kguiaddons ]; - propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - postInstall = '' - wrapQtProgram "$out/bin/preparetips5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcrash.nix deleted file mode 100644 index bbab78ccb40..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcrash.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwindowsystem -, qtx11extras -}: - -kdeFramework { - name = "kcrash"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdbusaddons.nix deleted file mode 100644 index d2ceab31d14..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdbusaddons.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, makeQtWrapper -, qtx11extras -}: - -kdeFramework { - name = "kdbusaddons"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - propagatedBuildInputs = [ qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/kquitapp5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdeclarative.nix deleted file mode 100644 index 74d107466cf..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdeclarative.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig -, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage -, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig -, qtdeclarative -}: - -kdeFramework { - name = "kdeclarative"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - epoxy kguiaddons kiconthemes kwidgetsaddons - ]; - propagatedBuildInputs = [ - kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative - ]; - postInstall = '' - wrapQtProgram "$out/bin/kpackagelauncherqml" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kded.nix b/pkgs/development/libraries/kde-frameworks-5.16/kded.nix deleted file mode 100644 index 47ae2d68c68..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kded.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kdoctools -, kinit -, kservice -}: - -kdeFramework { - name = "kded"; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdelibs4support.nix deleted file mode 100644 index 0dd5c415761..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdelibs4support.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth -, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons -, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels -, kinit, knotifications, kparts, kservice, ktextwidgets -, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui -, networkmanager, qtsvg, qtx11extras, xlibs -}: - -# TODO: debug docbook detection - -kdeFramework { - name = "kdelibs4support"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcompletion kconfig kservice kwidgetsaddons - kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM - ]; - propagatedBuildInputs = [ - kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons - kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio - kiconthemes kitemmodels kinit knotifications kparts ktextwidgets - kunitconversion kwindowsystem - ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdesu.nix deleted file mode 100644 index 364fbd6a720..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdesu.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty -, kservice -}: - -kdeFramework { - name = "kdesu"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kservice ]; - propagatedBuildInputs = [ ki18n kpty ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdewebkit.nix deleted file mode 100644 index d361313d1d4..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdewebkit.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit -}: - -kdeFramework { - name = "kdewebkit"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ]; - propagatedBuildInputs = [ ki18n kio qtwebkit ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdnssd.nix deleted file mode 100644 index f00432b0c9c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdnssd.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, avahi -}: - -kdeFramework { - name = "kdnssd"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ avahi ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/default.nix deleted file mode 100644 index 138c3fc33b9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 -, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages -}: - -kdeFramework { - name = "kdoctools"; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive ]; - propagatedBuildInputs = [ ki18n ]; - propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" - ]; - patches = [ ./kdoctools-no-find-docbook-xml.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/kdoctools-no-find-docbook-xml.patch deleted file mode 100644 index 4e3a33efab3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/kdoctools-no-find-docbook-xml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c4863c..f731775 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES - ) - - --find_package(DocBookXML4 "4.5") - - set_package_properties(DocBookXML4 PROPERTIES - TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/setup-hook.sh deleted file mode 100644 index 5cfffbd622d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addXdgData() { - addToSearchPath XDG_DATA_DIRS "$1/share" -} - -envHooks+=(addXdgData) diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kemoticons.nix deleted file mode 100644 index d165f84e3a2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kemoticons.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, karchive -, kconfig -, kcoreaddons -, kservice -}: - -kdeFramework { - name = "kemoticons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive kconfig kcoreaddons ]; - propagatedBuildInputs = [ kservice ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.16/kfilemetadata.nix deleted file mode 100644 index 92ca1f26b93..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kfilemetadata.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 -, ffmpeg, karchive, ki18n, popplerQt, qtbase, taglib -}: - -kdeFramework { - name = "kfilemetadata"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive popplerQt taglib ]; - propagatedBuildInputs = [ qtbase ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.16/kglobalaccel.nix deleted file mode 100644 index c535b3590a3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kglobalaccel.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kwindowsystem -, makeQtWrapper -, qtx11extras -}: - -kdeFramework { - name = "kglobalaccel"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/kglobalaccel5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kguiaddons.nix deleted file mode 100644 index bc4e9ab1184..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kguiaddons.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras -}: - -kdeFramework { - name = "kguiaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.16/khtml.nix deleted file mode 100644 index d40df466ebb..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/khtml.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, giflib, karchive -, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs -, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons -, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet -}: - -kdeFramework { - name = "khtml"; - nativeBuildInputs = [ extra-cmake-modules perl ]; - buildInputs = [ - giflib karchive kiconthemes knotifications kwallet kwidgetsaddons - kxmlgui phonon - ]; - propagatedBuildInputs = [ - kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets - kwindowsystem qtx11extras sonnet - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.16/kidletime.nix deleted file mode 100644 index fc086560023..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kidletime.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtbase -, qtx11extras -}: - -kdeFramework { - name = "kidletime"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - propagatedBuildInputs = [ qtbase ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.16/kimageformats.nix deleted file mode 100644 index 49d66bbcc2c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kimageformats.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ilmbase -}: - -kdeFramework { - name = "kimageformats"; - nativeBuildInputs = [ extra-cmake-modules ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.16/kinit/0001-kinit-libpath.patch deleted file mode 100644 index 9c76079a382..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kinit/0001-kinit-libpath.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sat, 13 Jun 2015 08:57:55 -0500 -Subject: [PATCH] kinit libpath - ---- - src/kdeinit/kinit.cpp | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 9e775b6..0ac5646 100644 ---- a/src/kdeinit/kinit.cpp -+++ b/src/kdeinit/kinit.cpp -@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, - if (!libpath.isEmpty()) { - if (!l.load()) { - if (libpath_relative) { -- // NB: Because Qt makes the actual dlopen() call, the -- // RUNPATH of kdeinit is *not* respected - see -- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 -- // - so we try hacking it in ourselves -- QString install_lib_dir = QFile::decodeName( -- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); -- libpath = install_lib_dir + libpath; -- l.setFileName(libpath); -+ // Use QT_PLUGIN_PATH to find shared library directories -+ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 -+ // shared libraries should be in /lib/qt5/plugins/../../ -+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); -+ const QString up = QString::fromLocal8Bit("/../../"); -+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); -+ Q_FOREACH (const QString &path, paths) { -+ l.setFileName(path + up + libpath); - l.load(); -+ if (l.isLoaded()) break; -+ } - } - } - if (!l.isLoaded()) { --- -2.4.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kinit/default.nix deleted file mode 100644 index 5f644d7c424..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kinit/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash -, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap -, libcap_progs -}: - -# TODO: setuid wrapper - -kdeFramework { - name = "kinit"; - nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; - buildInputs = [ kconfig kcrash kservice libcap ]; - propagatedBuildInputs = [ ki18n kio kwindowsystem ]; - patches = [ ./0001-kinit-libpath.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.16/kitemmodels.nix deleted file mode 100644 index a9024d771cc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kitemmodels.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kitemmodels"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.16/kitemviews.nix deleted file mode 100644 index 931019ce495..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kitemviews.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kitemviews"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.16/kjobwidgets.nix deleted file mode 100644 index 746edf12eea..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kjobwidgets.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwidgetsaddons -, qtx11extras -}: - -kdeFramework { - name = "kjobwidgets"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwidgetsaddons ]; - propagatedBuildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.16/kjs.nix deleted file mode 100644 index 768720f178c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kjs.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -}: - -kdeFramework { - name = "kjs"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - postInstall = '' - wrapQtProgram "$out/bin/kjs5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.16/kjsembed.nix deleted file mode 100644 index 22eef2d47bd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kjsembed.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs -, makeQtWrapper, qtsvg -}: - -kdeFramework { - name = "kjsembed"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ qtsvg ]; - propagatedBuildInputs = [ ki18n kjs ]; - postInstall = '' - wrapQtProgram "$out/bin/kjscmd5" - wrapQtProgram "$out/bin/kjsconsole" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.16/kmediaplayer.nix deleted file mode 100644 index 460458b2232..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kmediaplayer.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kparts -, kxmlgui -}: - -kdeFramework { - name = "kmediaplayer"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kxmlgui ]; - propagatedBuildInputs = [ kparts ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.16/knewstuff.nix deleted file mode 100644 index 5bcd6f30146..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/knewstuff.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, attica, karchive -, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio -, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui -}: - -kdeFramework { - name = "knewstuff"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive kcompletion kconfig kcoreaddons kiconthemes - kitemviews ktextwidgets kwidgetsaddons - ]; - propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.16/knotifications.nix deleted file mode 100644 index 7e301dd0f26..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/knotifications.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcodecs -, kconfig -, kcoreaddons -, kwindowsystem -, phonon -, qtx11extras -}: - -kdeFramework { - name = "knotifications"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs kconfig kcoreaddons phonon - ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.16/knotifyconfig.nix deleted file mode 100644 index dd99d2d4f1e..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/knotifyconfig.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig -, ki18n, kio, phonon -}: - -kdeFramework { - name = "knotifyconfig"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcompletion kconfig phonon ]; - propagatedBuildInputs = [ ki18n kio ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.16/kpackage/0001-allow-external-paths.patch deleted file mode 100644 index beede4d7ccb..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kpackage/0001-allow-external-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 28 Jan 2015 07:15:30 -0600 -Subject: [PATCH 1/2] allow external paths - ---- - src/kpackage/package.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index 539b21a..977a026 100644 ---- a/src/kpackage/package.cpp -+++ b/src/kpackage/package.cpp -@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.16/kpackage/0002-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 6e93fca9b21..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kpackage/0002-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 06:50:28 -0500 -Subject: [PATCH 2/2] qdiriterator follow symlinks - ---- - src/kpackage/packageloader.cpp | 2 +- - src/kpackage/private/packagejobthread.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp -index eb5ed47..94217f6 100644 ---- a/src/kpackage/packageloader.cpp -+++ b/src/kpackage/packageloader.cpp -@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat, - } else { - //qDebug() << "Not cached"; - // If there's no cache file, fall back to listing the directory -- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; -+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; - const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")); - - QDirIterator it(plugindir, nameFilters, QDir::Files, flags); -diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp -index ca523b3..1cfa792 100644 ---- a/src/kpackage/private/packagejobthread.cpp -+++ b/src/kpackage/private/packagejobthread.cpp -@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest) - QJsonArray plugins; - - int i = 0; -- QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - const QString path = it.fileInfo().absoluteFilePath(); --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kpackage/default.nix deleted file mode 100644 index d2dc262bf1a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kpackage/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, karchive -, kconfig -, kcoreaddons -, kdoctools -, ki18n -, makeQtWrapper -}: - -kdeFramework { - name = "kpackage"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ karchive kconfig ]; - propagatedBuildInputs = [ kcoreaddons ki18n ]; - patches = [ - ./0001-allow-external-paths.patch - ./0002-qdiriterator-follow-symlinks.patch - ]; - postInstall = '' - wrapQtProgram "$out/bin/kpackagetool5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.16/kparts.nix deleted file mode 100644 index 1c3e0b2cbc5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kparts.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice -, ktextwidgets, kwidgetsaddons, kxmlgui -}: - -kdeFramework { - name = "kparts"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig kcoreaddons kiconthemes kjobwidgets knotifications - kservice kwidgetsaddons - ]; - propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.16/kpeople.nix deleted file mode 100644 index 4c3877e7efd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kpeople.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n -, kitemviews, kservice, kwidgetsaddons, qtdeclarative -}: - -kdeFramework { - name = "kpeople"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons kitemviews kservice kwidgetsaddons - ]; - propagatedBuildInputs = [ ki18n qtdeclarative ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.16/kplotting.nix deleted file mode 100644 index c16f51b5ac3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kplotting.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kplotting"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.16/kpty.nix deleted file mode 100644 index 2e34e6f674c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kpty.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }: - -kdeFramework { - name = "kpty"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kcoreaddons ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kross.nix b/pkgs/development/libraries/kde-frameworks-5.16/kross.nix deleted file mode 100644 index 7c6f079feaa..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kross.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons -, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons -, kxmlgui, qtscript -}: - -kdeFramework { - name = "kross"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcompletion kcoreaddons kxmlgui ]; - propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.16/krunner.nix deleted file mode 100644 index 12d2b54d0eb..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/krunner.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, ki18n, kio, kservice, plasma-framework, qtquick1, solid -, threadweaver -}: - -kdeFramework { - name = "krunner"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig kcoreaddons kservice qtquick1 solid threadweaver - ]; - propagatedBuildInputs = [ ki18n kio plasma-framework ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.16/kservice/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 3d8397d8ee2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kservice/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 06:28:57 -0500 -Subject: [PATCH 1/2] qdiriterator follow symlinks - ---- - src/sycoca/kbuildsycoca.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp -index 1deae14..250baa8 100644 ---- a/src/sycoca/kbuildsycoca.cpp -+++ b/src/sycoca/kbuildsycoca.cpp -@@ -208,7 +208,7 @@ bool KBuildSycoca::build() - QStringList relFiles; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString filePath = it.next(); - Q_ASSERT(filePath.startsWith(dir)); // due to the line below... --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.16/kservice/0002-no-canonicalize-path.patch deleted file mode 100644 index 685c6852611..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kservice/0002-no-canonicalize-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 06:31:29 -0500 -Subject: [PATCH 2/2] no canonicalize path - ---- - src/sycoca/vfolder_menu.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp -index d3e31c3..d15d743 100644 ---- a/src/sycoca/vfolder_menu.cpp -+++ b/src/sycoca/vfolder_menu.cpp -@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR - } - - if (!relative) { -- QString resolved = QDir(dir).canonicalPath(); -+ QString resolved = QDir::cleanPath(dir); - if (!resolved.isEmpty()) { - dir = resolved; - } --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kservice/default.nix deleted file mode 100644 index 03b7c7c2f51..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kservice/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem -}: - -kdeFramework { - name = "kservice"; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcrash kdbusaddons ]; - propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ]; - propagatedUserEnvPkgs = [ kcoreaddons ]; - patches = [ - ./0001-qdiriterator-follow-symlinks.patch - ./0002-no-canonicalize-path.patch - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.16/kservice/setup-hook.sh deleted file mode 100644 index c28e862ff8a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kservice/setup-hook.sh +++ /dev/null @@ -1,43 +0,0 @@ -addServicePkg() { - local propagated - for dir in "share/kservices5" "share/kservicetypes5"; do - if [[ -d "$1/$dir" ]]; then - propagated= - for pkg in $propagatedBuildInputs; do - if [[ "z$pkg" == "z$1" ]]; then - propagated=1 - break - fi - done - if [[ -z $propagated ]]; then - propagatedBuildInputs="$propagatedBuildInputs $1" - fi - - propagated= - for pkg in $propagatedUserEnvPkgs; do - if [[ "z$pkg" == "z$1" ]]; then - propagated=1 - break - fi - done - if [[ -z $propagated ]]; then - propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" - fi - - break - fi - done -} - -envHooks+=(addServicePkg) - -local propagated -for pkg in $propagatedBuildInputs; do - if [[ "z$pkg" == "z@out@" ]]; then - propagated=1 - break - fi -done -if [[ -z $propagated ]]; then - propagatedBuildInputs="$propagatedBuildInputs @out@" -fi diff --git a/pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/0001-no-qcoreapplication.patch deleted file mode 100644 index def55bff9b2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/0001-no-qcoreapplication.patch +++ /dev/null @@ -1,48 +0,0 @@ -From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 09:08:59 -0500 -Subject: [PATCH] no qcoreapplication - ---- - src/syntax/data/katehighlightingindexer.cpp | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp -index 3c63140..e3d5efe 100644 ---- a/src/syntax/data/katehighlightingindexer.cpp -+++ b/src/syntax/data/katehighlightingindexer.cpp -@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName) - - int main(int argc, char *argv[]) - { -- // get app instance -- QCoreApplication app(argc, argv); -- - // ensure enough arguments are passed -- if (app.arguments().size() < 3) -+ if (argc < 3) - return 1; - - // open schema - QXmlSchema schema; -- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) -+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) - return 2; - -- const QString hlFilenamesListing = app.arguments().value(3); -+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); - if (hlFilenamesListing.isEmpty()) { - return 1; - } -@@ -147,7 +144,7 @@ int main(int argc, char *argv[]) - return anyError; - - // create outfile, after all has worked! -- QFile outFile(app.arguments().at(1)); -+ QFile outFile(QString::fromLocal8Bit(argv[1])); - if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) - return 7; - --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/default.nix deleted file mode 100644 index 39092fbb278..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig -, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript -, qtxmlpatterns, sonnet -}: - -kdeFramework { - name = "ktexteditor"; - nativeBuildInputs = [ extra-cmake-modules perl ]; - buildInputs = [ - karchive kconfig kguiaddons kiconthemes kparts qtscript - qtxmlpatterns - ]; - propagatedBuildInputs = [ ki18n kio sonnet ]; - patches = [ ./0001-no-qcoreapplication.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.16/ktextwidgets.nix deleted file mode 100644 index e332d4ff9a8..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/ktextwidgets.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig -, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem -, sonnet -}: - -kdeFramework { - name = "ktextwidgets"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcompletion kconfig kconfigwidgets kiconthemes kservice - ]; - propagatedBuildInputs = [ ki18n kwindowsystem sonnet ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.16/kunitconversion.nix deleted file mode 100644 index 3cf0f847d83..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kunitconversion.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n }: - -kdeFramework { - name = "kunitconversion"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.16/kwallet.nix deleted file mode 100644 index 7c4177e009d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kwallet.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications -, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper -}: - -kdeFramework { - name = "kwallet"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kconfig kcoreaddons kdbusaddons kiconthemes knotifications - kservice kwidgetsaddons libgcrypt - ]; - propagatedBuildInputs = [ ki18n kwindowsystem ]; - postInstall = '' - wrapQtProgram "$out/bin/kwalletd5" - wrapQtProgram "$out/bin/kwallet-query" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kwidgetsaddons.nix deleted file mode 100644 index d95f44d3fec..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kwidgetsaddons.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kwidgetsaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.16/kwindowsystem.nix deleted file mode 100644 index 09ab1f2200d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kwindowsystem.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras -}: - -kdeFramework { - name = "kwindowsystem"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.16/kxmlrpcclient.nix deleted file mode 100644 index 20a300b68bc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kxmlrpcclient.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: - -kdeFramework { - name = "kxmlrpcclient"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ki18n kio ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.16/modemmanager-qt.nix deleted file mode 100644 index 7d7f769d6a9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/modemmanager-qt.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, modemmanager -}: - -kdeFramework { - name = "modemmanager-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ modemmanager ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.16/networkmanager-qt.nix deleted file mode 100644 index 333378bd143..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/networkmanager-qt.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, networkmanager -}: - -kdeFramework { - name = "networkmanager-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ networkmanager ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/plasma-framework/default.nix deleted file mode 100644 index d8846f77723..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/plasma-framework/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive -, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative -, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio -, knotifications, kpackage, kservice, kwindowsystem, kxmlgui -, makeQtWrapper, qtscript, qtx11extras -}: - -kdeFramework { - name = "plasma-framework"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons - kiconthemes knotifications kxmlgui qtscript - ]; - propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem - qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/plasmapkg2" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/solid.nix b/pkgs/development/libraries/kde-frameworks-5.16/solid.nix deleted file mode 100644 index afd125e3c59..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/solid.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, makeQtWrapper -, qtdeclarative -}: - -kdeFramework { - name = "solid"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ qtdeclarative ]; - postInstall = '' - wrapQtProgram "$out/bin/solid-hardware5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.16/sonnet.nix deleted file mode 100644 index 943fe04a1c9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/sonnet.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, hunspell -}: - -kdeFramework { - name = "sonnet"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ hunspell ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.16/srcs.nix deleted file mode 100644 index 8e3d6a4a921..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/srcs.nix +++ /dev/null @@ -1,565 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - attica = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/attica-5.16.0.tar.xz"; - sha256 = "1739pf892vgvl03l4322p09p346ca4nghc50ansny7868c73f95w"; - name = "attica-5.16.0.tar.xz"; - }; - }; - baloo = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/baloo-5.16.0.tar.xz"; - sha256 = "0s8l9q43ak87sjagashxfwadildlz3vdysj96in6v3gcg09ngm8j"; - name = "baloo-5.16.0.tar.xz"; - }; - }; - bluez-qt = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/bluez-qt-5.16.0.tar.xz"; - sha256 = "0xxlwb4kqiiqmph9vr6ppyzjndzz1ys9qbnzzinrhhdmiir5m3k6"; - name = "bluez-qt-5.16.0.tar.xz"; - }; - }; - breeze-icons = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/breeze-icons-5.16.0.tar.xz"; - sha256 = "1vmwnqin9p6p78kshn1bfq7zz1znmm615bq28545shywfkri1yil"; - name = "breeze-icons-5.16.0.tar.xz"; - }; - }; - extra-cmake-modules = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/extra-cmake-modules-5.16.0.tar.xz"; - sha256 = "06xfmxbjkrdswh2n0qmdi5zvm3dqhawiazi5x6p32n77ij5wiph9"; - name = "extra-cmake-modules-5.16.0.tar.xz"; - }; - }; - frameworkintegration = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/frameworkintegration-5.16.0.tar.xz"; - sha256 = "0vyv3c34mpp6yjgqm8gyir7cwxn3a064q5d3ms49macpjkkz7c6f"; - name = "frameworkintegration-5.16.0.tar.xz"; - }; - }; - kactivities = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kactivities-5.16.0.tar.xz"; - sha256 = "0aq0yxbzhg3r9jpddn1vnylmjb2xr4xx5rviisyfa6nhn21ynqxm"; - name = "kactivities-5.16.0.tar.xz"; - }; - }; - kapidox = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kapidox-5.16.0.tar.xz"; - sha256 = "0gfxnssbkdkfncka956y5d2w3zm7yxkl11jvl88cwg6zx2rfh1a4"; - name = "kapidox-5.16.0.tar.xz"; - }; - }; - karchive = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/karchive-5.16.0.tar.xz"; - sha256 = "0rn8n7lnw9z7rl1d2cdy59j4f38jzd6sj0s33dkfk04i4kl0ccpc"; - name = "karchive-5.16.0.tar.xz"; - }; - }; - kauth = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kauth-5.16.0.tar.xz"; - sha256 = "1972c4m7kcj7hnklvy973935sn0khl4jby6g8q2i5hzivp5b0sn3"; - name = "kauth-5.16.0.tar.xz"; - }; - }; - kbookmarks = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kbookmarks-5.16.0.tar.xz"; - sha256 = "009yls3f4l97z1hcn9nk0j35b0kfysc2l0gvdnijk9prgldn287j"; - name = "kbookmarks-5.16.0.tar.xz"; - }; - }; - kcmutils = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kcmutils-5.16.0.tar.xz"; - sha256 = "1cz3lgwm6vp39c40yykg26791xcjk3vr83266nhcyl6cm7dk04rl"; - name = "kcmutils-5.16.0.tar.xz"; - }; - }; - kcodecs = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kcodecs-5.16.0.tar.xz"; - sha256 = "164yj6mpqb7hl9v5xdhgwpddrk7d4qig8qhx9i8xlxbb2v30rlcp"; - name = "kcodecs-5.16.0.tar.xz"; - }; - }; - kcompletion = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kcompletion-5.16.0.tar.xz"; - sha256 = "084nqd5j7rffqh67v862h88zsqks3pyynw2fzmayhngcjm1y8c22"; - name = "kcompletion-5.16.0.tar.xz"; - }; - }; - kconfig = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kconfig-5.16.0.tar.xz"; - sha256 = "1871ixmk4z4ajfnszlyba4ibmywz0iw7ibg073wwzm3hpx2nizmf"; - name = "kconfig-5.16.0.tar.xz"; - }; - }; - kconfigwidgets = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kconfigwidgets-5.16.0.tar.xz"; - sha256 = "11pl9295qnvz9284liyacz87hb5w5a4ybzcyg0jchc62aw1q9bi6"; - name = "kconfigwidgets-5.16.0.tar.xz"; - }; - }; - kcoreaddons = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kcoreaddons-5.16.0.tar.xz"; - sha256 = "1944csk50q42a2prm6fijnzi1cds23phdzkfvsxlxxxzga7744fm"; - name = "kcoreaddons-5.16.0.tar.xz"; - }; - }; - kcrash = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kcrash-5.16.0.tar.xz"; - sha256 = "1bk7dvlzxs6n63iy0lmb7jgwa3np0ja4ldvwxx1y82gq593dqwa9"; - name = "kcrash-5.16.0.tar.xz"; - }; - }; - kdbusaddons = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdbusaddons-5.16.0.tar.xz"; - sha256 = "0ykfgmhisyiah9nisb73xcdfnxgiwcpjzry68x9j1r60b506r6za"; - name = "kdbusaddons-5.16.0.tar.xz"; - }; - }; - kdeclarative = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdeclarative-5.16.0.tar.xz"; - sha256 = "0ck8w2vd9z288h08zc8fa2bndgcg6m63g34dl95snb4h00ciybd4"; - name = "kdeclarative-5.16.0.tar.xz"; - }; - }; - kded = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kded-5.16.0.tar.xz"; - sha256 = "0p0mxa989k9n45iaq0ymgr228nx4g31v3bcbdm2vlzzr524jnx8q"; - name = "kded-5.16.0.tar.xz"; - }; - }; - kdelibs4support = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/kdelibs4support-5.16.0.tar.xz"; - sha256 = "0y2m67h79in7hdlv95g31kkdnjafdda1h26dm9fdjv52183n8kdc"; - name = "kdelibs4support-5.16.0.tar.xz"; - }; - }; - kdesignerplugin = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdesignerplugin-5.16.0.tar.xz"; - sha256 = "1x2kd70nyvykcmd4whnv991pqyflpaahans5jaz0v0y1a2l67965"; - name = "kdesignerplugin-5.16.0.tar.xz"; - }; - }; - kdesu = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdesu-5.16.0.tar.xz"; - sha256 = "10g7vg8q2hibdh098n373jg8njzr0w9dxyfi9yb84pjyyshj7km6"; - name = "kdesu-5.16.0.tar.xz"; - }; - }; - kdewebkit = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdewebkit-5.16.0.tar.xz"; - sha256 = "1nq6j1k3ddp9p40mdgczcvv0ba16haz3s4km9pyxsv7qwrbpm6wa"; - name = "kdewebkit-5.16.0.tar.xz"; - }; - }; - kdnssd = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdnssd-5.16.0.tar.xz"; - sha256 = "1ds1xvw7v75vz2nnrygy10slwysis75y57s8xafsw7fhs8sybvc3"; - name = "kdnssd-5.16.0.tar.xz"; - }; - }; - kdoctools = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdoctools-5.16.0.tar.xz"; - sha256 = "1qf82drggsbhwlwsrmwbk6m0x4jhihhx0wz32y7ybhn867p8glgb"; - name = "kdoctools-5.16.0.tar.xz"; - }; - }; - kemoticons = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kemoticons-5.16.0.tar.xz"; - sha256 = "166la4160vjf444cylyr4dnc507fqsifl9qpdw2gqa8nw45w6kms"; - name = "kemoticons-5.16.0.tar.xz"; - }; - }; - kfilemetadata = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kfilemetadata-5.16.0.tar.xz"; - sha256 = "1yf7hgpgrvw8qvyj0l8c828y6xh3w3grslg4s9grx93jsw2jpypm"; - name = "kfilemetadata-5.16.0.tar.xz"; - }; - }; - kglobalaccel = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kglobalaccel-5.16.0.tar.xz"; - sha256 = "12hxhi8b53az3qrpgcjz494vylbqgxq3921qhsccy3nvywg7r3mv"; - name = "kglobalaccel-5.16.0.tar.xz"; - }; - }; - kguiaddons = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kguiaddons-5.16.0.tar.xz"; - sha256 = "1gv0rhr06xzgkw1pj1nc4jbc6vmr952bbvs1vp3x2609pfn7d8b4"; - name = "kguiaddons-5.16.0.tar.xz"; - }; - }; - khtml = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/khtml-5.16.0.tar.xz"; - sha256 = "11q66h7hlsmjc7rj4m70yian6vymbjisz7yw7ck81qbv7b75w9bk"; - name = "khtml-5.16.0.tar.xz"; - }; - }; - ki18n = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/ki18n-5.16.0.tar.xz"; - sha256 = "08hxinx0x8b4pprx23a6aklc9sd26cd21ajdzlk2wrv8jp3dl2pw"; - name = "ki18n-5.16.0.tar.xz"; - }; - }; - kiconthemes = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kiconthemes-5.16.0.tar.xz"; - sha256 = "10y9rz4dmza6xjl8n9hhjpymnxzpdqk6w82s7d4yaam2kkv5hysk"; - name = "kiconthemes-5.16.0.tar.xz"; - }; - }; - kidletime = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kidletime-5.16.0.tar.xz"; - sha256 = "1s51xbn2i50d7dpl7p9aq92gy5zvgxb0liaq36f425g3hzmdkr57"; - name = "kidletime-5.16.0.tar.xz"; - }; - }; - kimageformats = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kimageformats-5.16.0.tar.xz"; - sha256 = "02jsmz3ysddywd9v7y8cbsvanpg4d9xwbgr0sqxb600a4s0z797s"; - name = "kimageformats-5.16.0.tar.xz"; - }; - }; - kinit = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kinit-5.16.0.tar.xz"; - sha256 = "1flpxypblj7jjv854f81xd6yx3x1wsns18hpp19jnwb54w2xy0g0"; - name = "kinit-5.16.0.tar.xz"; - }; - }; - kio = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kio-5.16.0.tar.xz"; - sha256 = "1mm94ywvkfnrfkd29vhcnc8v3ly9d33vvjmrhz9r2q3rw4zyjpiv"; - name = "kio-5.16.0.tar.xz"; - }; - }; - kitemmodels = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kitemmodels-5.16.0.tar.xz"; - sha256 = "1bm948adzhqpq698wg1bqxz09cmpxwqhpv1qvb6fgnxv2fyjgdg2"; - name = "kitemmodels-5.16.0.tar.xz"; - }; - }; - kitemviews = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kitemviews-5.16.0.tar.xz"; - sha256 = "1bv41lijf3yh2dwwkwjp80sxz5yffyl1hqs7prhhv2jyn88xpx6a"; - name = "kitemviews-5.16.0.tar.xz"; - }; - }; - kjobwidgets = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kjobwidgets-5.16.0.tar.xz"; - sha256 = "07dclwc85294ca3vkg1sf9zqcgr3brzjimb8qqy0svdbfvbr0kxa"; - name = "kjobwidgets-5.16.0.tar.xz"; - }; - }; - kjs = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/kjs-5.16.0.tar.xz"; - sha256 = "0zj5px9wx5c5yzlsz48bahi0xnshn3xbrfm4l9j4x4nj4vk3jksv"; - name = "kjs-5.16.0.tar.xz"; - }; - }; - kjsembed = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/kjsembed-5.16.0.tar.xz"; - sha256 = "17vsbz0a6cd0nfjpwlyr6401pfrz0snxrcqwnj0llcmbpkbc3las"; - name = "kjsembed-5.16.0.tar.xz"; - }; - }; - kmediaplayer = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/kmediaplayer-5.16.0.tar.xz"; - sha256 = "0j9g13qd7l2kwn1imphdsannjdxbx3jk8jl3d9xa6g33mqav8bjc"; - name = "kmediaplayer-5.16.0.tar.xz"; - }; - }; - knewstuff = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/knewstuff-5.16.0.tar.xz"; - sha256 = "0213lnnlah2jq8a5rbbwzjxl0qc0cgmsnixjbkbvq3wr7yb1s6hr"; - name = "knewstuff-5.16.0.tar.xz"; - }; - }; - knotifications = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/knotifications-5.16.0.tar.xz"; - sha256 = "0bfr68a2favrnmpmck16vrqy8mni72plkn0fv0fl6bfq3fmi645a"; - name = "knotifications-5.16.0.tar.xz"; - }; - }; - knotifyconfig = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/knotifyconfig-5.16.0.tar.xz"; - sha256 = "0ma5s4451h9jl9va4nnjrwhxgq5jmgq2b0m5y7hdh7m03hwhjqmc"; - name = "knotifyconfig-5.16.0.tar.xz"; - }; - }; - kpackage = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kpackage-5.16.0.tar.xz"; - sha256 = "0js7dbg0y6b6nqnwc70706pchxpg12l9g7si1qab2jq8ir5drrap"; - name = "kpackage-5.16.0.tar.xz"; - }; - }; - kparts = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kparts-5.16.0.tar.xz"; - sha256 = "0g405r2x900d8c5jdsspy05m70agj3gqja6y3j319b8ph3yycnq4"; - name = "kparts-5.16.0.tar.xz"; - }; - }; - kpeople = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kpeople-5.16.0.tar.xz"; - sha256 = "07lsacynsr3mzqyizbq3mywk8d54kyzfx5a3nminf2hs5a1wgg8m"; - name = "kpeople-5.16.0.tar.xz"; - }; - }; - kplotting = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kplotting-5.16.0.tar.xz"; - sha256 = "1fc448f52lf8nvs2zi2r55vqfhph7qdvdwvdpk0gz8jadj4gciz7"; - name = "kplotting-5.16.0.tar.xz"; - }; - }; - kpty = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kpty-5.16.0.tar.xz"; - sha256 = "074sws3rvjs090l2cbhl9gxcgb6bjlxard8ylmrkhvqr0dc9syvc"; - name = "kpty-5.16.0.tar.xz"; - }; - }; - kross = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/kross-5.16.0.tar.xz"; - sha256 = "05mwldy2jwal5pjn6hbiny61xd02sbljkkbyc33ni5qiiznxjk56"; - name = "kross-5.16.0.tar.xz"; - }; - }; - krunner = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/krunner-5.16.0.tar.xz"; - sha256 = "1rk7j6kj3sv6dqnv98hprdyrp94wz57lr1lvlmw11kdlm1mmh45p"; - name = "krunner-5.16.0.tar.xz"; - }; - }; - kservice = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kservice-5.16.0.tar.xz"; - sha256 = "140b4jxs3s00xbbbh8jjqw9q5krsd7xh4qal2k0hjk0nfx5blvp9"; - name = "kservice-5.16.0.tar.xz"; - }; - }; - ktexteditor = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/ktexteditor-5.16.0.tar.xz"; - sha256 = "0g1yms864jq83c48j5ida4pmwisqxn49kl5daf7c1ssaia1pxfqw"; - name = "ktexteditor-5.16.0.tar.xz"; - }; - }; - ktextwidgets = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/ktextwidgets-5.16.0.tar.xz"; - sha256 = "1vzklpq1zdn3cg5hh7f2988q3sdn6y9mr1hgkmpcsc1y8pfhn7w9"; - name = "ktextwidgets-5.16.0.tar.xz"; - }; - }; - kunitconversion = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kunitconversion-5.16.0.tar.xz"; - sha256 = "1ppmma1z1hk9shfn1w7dvy72872ryyqs9252s65pzx3ycrd00nll"; - name = "kunitconversion-5.16.0.tar.xz"; - }; - }; - kwallet = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kwallet-5.16.0.tar.xz"; - sha256 = "1gcwc7m8q5ya3gbj02pmmjaigpr0y94m3h526b2xdbksc23kv2gi"; - name = "kwallet-5.16.0.tar.xz"; - }; - }; - kwidgetsaddons = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kwidgetsaddons-5.16.0.tar.xz"; - sha256 = "0vzyikwp351sdywh38m6jj851sf5l4s8mxyvf5i6jkzpzl5591a3"; - name = "kwidgetsaddons-5.16.0.tar.xz"; - }; - }; - kwindowsystem = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kwindowsystem-5.16.0.tar.xz"; - sha256 = "07hl0sy0573nwddzyph5s75h983569p5bb96gxjbh0lh3ixar2ig"; - name = "kwindowsystem-5.16.0.tar.xz"; - }; - }; - kxmlgui = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kxmlgui-5.16.0.tar.xz"; - sha256 = "1vzhf29gd5kn94x1cydnblb5v5163a52vpwh7fpsg3dlhhwd9h2s"; - name = "kxmlgui-5.16.0.tar.xz"; - }; - }; - kxmlrpcclient = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kxmlrpcclient-5.16.0.tar.xz"; - sha256 = "1pacf0q67xckw8nvj3bncz5ydsmiw2a0fksmabklpbdmi9p2dz0a"; - name = "kxmlrpcclient-5.16.0.tar.xz"; - }; - }; - modemmanager-qt = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/modemmanager-qt-5.16.0.tar.xz"; - sha256 = "0q135rhp52pk3ilmx9gx2cmn2p834s56kcqg3vdfycvi5gmvn81x"; - name = "modemmanager-qt-5.16.0.tar.xz"; - }; - }; - networkmanager-qt = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/networkmanager-qt-5.16.0.tar.xz"; - sha256 = "115r211bf16dlcccib6dg0fd22g9kq9xshh8vf7f4msaa63kdfjv"; - name = "networkmanager-qt-5.16.0.tar.xz"; - }; - }; - oxygen-icons5 = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/oxygen-icons5-5.16.0.tar.xz"; - sha256 = "0nmr1jp3kr41k4wn9jvj1yvq9w51ljajzk94qf5k7rh68dzj4jl7"; - name = "oxygen-icons5-5.16.0.tar.xz"; - }; - }; - plasma-framework = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/plasma-framework-5.16.0.tar.xz"; - sha256 = "1snih6i9n29c48sfw51csl99khps1c9bralb599d3c6q1j4iqzp3"; - name = "plasma-framework-5.16.0.tar.xz"; - }; - }; - solid = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/solid-5.16.0.tar.xz"; - sha256 = "1km4nb8cmqag2lpwgrmjj5rn8lv6s9lbhh2d3dfb2f0lmnqm00sl"; - name = "solid-5.16.0.tar.xz"; - }; - }; - sonnet = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/sonnet-5.16.0.tar.xz"; - sha256 = "1fn729ijclvdrxw9h0c23sbayfagh2jb7yglgsqqjsg3bdp72qi7"; - name = "sonnet-5.16.0.tar.xz"; - }; - }; - threadweaver = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/threadweaver-5.16.0.tar.xz"; - sha256 = "1ansjzfl6bvwqw2yi597gvzikyaaf8z5pvldwfd4mamb3vl42y4y"; - name = "threadweaver-5.16.0.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.16/threadweaver.nix deleted file mode 100644 index 52817921cc7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/threadweaver.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "threadweaver"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/attica.nix b/pkgs/development/libraries/kde-frameworks-5.17/attica.nix index 98721876c12..98721876c12 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/attica.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/attica.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.17/baloo.nix index 38c41d9271d..38c41d9271d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/baloo.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.17/bluez-qt.nix index f981b0516f7..f981b0516f7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/bluez-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.17/breeze-icons.nix index 8c86a46401d..879262c56a4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/breeze-icons.nix @@ -1,8 +1,10 @@ { kdeFramework , extra-cmake-modules +, qtsvg }: kdeFramework { name = "breeze-icons"; nativeBuildInputs = [ extra-cmake-modules ]; + propagatedUserEnvPkgs = [ qtsvg ]; } diff --git a/pkgs/development/libraries/kde-frameworks-5.16/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/default.nix index 6c2889aa598..828faaa631f 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/default.nix @@ -14,29 +14,29 @@ let mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; - kdeFramework = args: - let - inherit (args) name; - inherit (srcs."${name}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; + packages = self: with self; { + kdeFramework = args: + let + inherit (args) name; + inherit (srcs."${name}") src version; + in stdenv.mkDerivation (args // { + name = "${name}-${version}"; + inherit src; - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); - }); + meta = { + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + }); - addPackages = self: with self; { attica = callPackage ./attica.nix {}; baloo = callPackage ./baloo.nix {}; bluez-qt = callPackage ./bluez-qt.nix {}; @@ -70,7 +70,7 @@ let kguiaddons = callPackage ./kguiaddons.nix {}; khtml = callPackage ./khtml.nix {}; ki18n = callPackage ./ki18n.nix {}; - kiconthemes = callPackage ./kiconthemes.nix {}; + kiconthemes = callPackage ./kiconthemes {}; kidletime = callPackage ./kidletime.nix {}; kimageformats = callPackage ./kimageformats.nix {}; kinit = callPackage ./kinit {}; @@ -109,6 +109,4 @@ let threadweaver = callPackage ./threadweaver.nix {}; }; - newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope); - -in lib.makeScope newScope addPackages +in packages diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/0001-extra-cmake-modules-paths.patch index 9717716faf5..9717716faf5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/0001-extra-cmake-modules-paths.patch +++ b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/0001-extra-cmake-modules-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/default.nix index 4e1b1aff3bd..4e1b1aff3bd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/setup-hook.sh index a6fa6189240..a6fa6189240 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.16/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.17/fetchsrcs.sh index 72d83057545..16a8de82c59 100755 --- a/pkgs/development/libraries/kde-frameworks-5.16/fetchsrcs.sh +++ b/pkgs/development/libraries/kde-frameworks-5.17/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/frameworks/5.16/" +RELEASE_URL="http://download.kde.org/stable/frameworks/5.17/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/development/libraries/kde-frameworks-5.15/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.17/frameworkintegration.nix index 26987c385ad..26987c385ad 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/frameworkintegration.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.17/kactivities.nix index 3225098f439..3225098f439 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kactivities.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.17/kapidox.nix index 647be8f052c..647be8f052c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kapidox.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kapidox.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.17/karchive.nix index a8d9a0003c3..a8d9a0003c3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/karchive.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix index 42a10019334..2b000ff3c04 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix @@ -1,13 +1,13 @@ { kdeFramework, lib , extra-cmake-modules , kcoreaddons -, polkitQt +, polkit-qt }: kdeFramework { name = "kauth"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ polkitQt ]; + buildInputs = [ polkit-qt ]; propagatedBuildInputs = [ kcoreaddons ]; patches = [ ./kauth-policy-install.patch ]; meta = { diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.17/kauth/kauth-policy-install.patch index 340155256f2..340155256f2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kauth/kauth-policy-install.patch +++ b/pkgs/development/libraries/kde-frameworks-5.17/kauth/kauth-policy-install.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.17/kbookmarks.nix index 1a469ab4db6..1a469ab4db6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kbookmarks.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/0001-qdiriterator-follow-symlinks.patch index 0d861fa9501..0d861fa9501 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/default.nix index dbbb783ac61..dbbb783ac61 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcodecs.nix index 53a69a69b69..53a69a69b69 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kcodecs.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcompletion.nix index e393774f16a..e393774f16a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kcompletion.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.17/kconfig.nix index e132afe5988..e132afe5988 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kconfig.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch index 7a6c0ee9053..7a6c0ee9053 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/default.nix index 0e14d06edd3..0e14d06edd3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcoreaddons.nix index f3a1db7bd48..f3a1db7bd48 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kcoreaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcrash.nix index bbab78ccb40..bbab78ccb40 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kcrash.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdbusaddons.nix index d2ceab31d14..d2ceab31d14 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdbusaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdeclarative.nix index 74d107466cf..74d107466cf 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdeclarative.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kded.nix b/pkgs/development/libraries/kde-frameworks-5.17/kded.nix index 47ae2d68c68..47ae2d68c68 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kded.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kded.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdelibs4support.nix index 0dd5c415761..0dd5c415761 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdelibs4support.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdelibs4support.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdesignerplugin.nix index cbc114ccca0..cbc114ccca0 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdesignerplugin.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdesu.nix index 364fbd6a720..364fbd6a720 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdesu.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdesu.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdewebkit.nix index d361313d1d4..d361313d1d4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdewebkit.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdewebkit.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdnssd.nix index f00432b0c9c..f00432b0c9c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdnssd.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/default.nix index 138c3fc33b9..138c3fc33b9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/kdoctools-no-find-docbook-xml.patch index 4e3a33efab3..4e3a33efab3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/kdoctools-no-find-docbook-xml.patch +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/setup-hook.sh index 5cfffbd622d..5cfffbd622d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kemoticons.nix index d165f84e3a2..d165f84e3a2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kemoticons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kemoticons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix index 92ca1f26b93..be99c58d550 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kfilemetadata.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix @@ -1,11 +1,11 @@ { kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 -, ffmpeg, karchive, ki18n, popplerQt, qtbase, taglib +, ffmpeg, karchive, ki18n, poppler, qtbase, taglib }: kdeFramework { name = "kfilemetadata"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive popplerQt taglib ]; + buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ]; propagatedBuildInputs = [ qtbase ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.17/kglobalaccel.nix index c535b3590a3..c535b3590a3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kglobalaccel.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kguiaddons.nix index bc4e9ab1184..bc4e9ab1184 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kguiaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.17/khtml.nix index d40df466ebb..d40df466ebb 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/khtml.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.16/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix index 915e3294b46..268006512e7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix @@ -2,13 +2,14 @@ , extra-cmake-modules , gettext , python +, qtdeclarative , qtscript }: kdeFramework { name = "ki18n"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtscript ]; + buildInputs = [ qtdeclarative qtscript ]; propagatedNativeBuildInputs = [ gettext python ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default-theme-breeze.patch new file mode 100644 index 00000000000..5b3b15d5d5b --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default-theme-breeze.patch @@ -0,0 +1,13 @@ +Index: kiconthemes-5.17.0/src/kicontheme.cpp +=================================================================== +--- kiconthemes-5.17.0.orig/src/kicontheme.cpp ++++ kiconthemes-5.17.0/src/kicontheme.cpp +@@ -557,7 +557,7 @@ void KIconTheme::reconfigure() + // static + QString KIconTheme::defaultThemeName() + { +- return QStringLiteral("oxygen"); ++ return QStringLiteral("breeze"); + } + + void KIconTheme::assignIconsToContextMenu(ContextMenus type, diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default.nix index eb24403169d..b78b25582be 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default.nix @@ -1,13 +1,14 @@ -{ kdeFramework, lib, makeQtWrapper -, extra-cmake-modules, kconfigwidgets, ki18n -, kitemviews, qtsvg +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, makeQtWrapper +, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg }: kdeFramework { name = "kiconthemes"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ kconfigwidgets kitemviews qtsvg ]; - propagatedBuildInputs = [ ki18n ]; + propagatedBuildInputs = [ breeze-icons ki18n ]; postInstall = '' wrapQtProgram "$out/bin/kiconfinder5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/series new file mode 100644 index 00000000000..ab5cc8a3edb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/series @@ -0,0 +1 @@ +default-theme-breeze.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.17/kidletime.nix index fc086560023..fc086560023 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kidletime.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.17/kimageformats.nix index 49d66bbcc2c..49d66bbcc2c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kimageformats.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.17/kinit/0001-kinit-libpath.patch index 9c76079a382..9c76079a382 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kinit/0001-kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks-5.17/kinit/0001-kinit-libpath.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kinit/default.nix index 5f644d7c424..5f644d7c424 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kinit/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kio.nix b/pkgs/development/libraries/kde-frameworks-5.17/kio.nix index 199565e2418..199565e2418 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kio.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.17/kitemmodels.nix index a9024d771cc..a9024d771cc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kitemmodels.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.17/kitemviews.nix index 931019ce495..931019ce495 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kitemviews.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.17/kjobwidgets.nix index 746edf12eea..746edf12eea 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kjobwidgets.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.17/kjs.nix index 768720f178c..768720f178c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kjs.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.17/kjsembed.nix index 22eef2d47bd..22eef2d47bd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kjsembed.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.17/kmediaplayer.nix index 460458b2232..460458b2232 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kmediaplayer.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kmediaplayer.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.17/knewstuff.nix index 5bcd6f30146..5bcd6f30146 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/knewstuff.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.17/knotifications.nix index 7e301dd0f26..7e301dd0f26 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/knotifications.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.17/knotifyconfig.nix index dd99d2d4f1e..dd99d2d4f1e 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/knotifyconfig.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch index beede4d7ccb..beede4d7ccb 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch +++ b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch index 6e93fca9b21..6e93fca9b21 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/default.nix index d2dc262bf1a..d2dc262bf1a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.17/kparts.nix index 1c3e0b2cbc5..1c3e0b2cbc5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kparts.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kparts.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.17/kpeople.nix index 4c3877e7efd..4c3877e7efd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kpeople.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kpeople.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.17/kplotting.nix index c16f51b5ac3..c16f51b5ac3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kplotting.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.17/kpty.nix index 2e34e6f674c..2e34e6f674c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kpty.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kross.nix b/pkgs/development/libraries/kde-frameworks-5.17/kross.nix index 7c6f079feaa..7c6f079feaa 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kross.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kross.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.17/krunner.nix index 12d2b54d0eb..12d2b54d0eb 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/krunner.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kservice/0001-qdiriterator-follow-symlinks.patch index 3d8397d8ee2..3d8397d8ee2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.17/kservice/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch index 685c6852611..685c6852611 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch +++ b/pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix index 03b7c7c2f51..03b7c7c2f51 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh index c28e862ff8a..c28e862ff8a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch index def55bff9b2..def55bff9b2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch +++ b/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix index 39092fbb278..39092fbb278 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix index e332d4ff9a8..e332d4ff9a8 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix index 3cf0f847d83..3cf0f847d83 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix index 7c4177e009d..7c4177e009d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix index d95f44d3fec..d95f44d3fec 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix index 09ab1f2200d..09ab1f2200d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kwindowsystem.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix index f081d5f9170..f081d5f9170 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix index 20a300b68bc..20a300b68bc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix index 7d7f769d6a9..7d7f769d6a9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix index 333378bd143..333378bd143 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.16/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix index ee350f8e153..ee350f8e153 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/oxygen-icons5.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix index d8846f77723..d8846f77723 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix b/pkgs/development/libraries/kde-frameworks-5.17/solid.nix index afd125e3c59..afd125e3c59 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/solid.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix index 943fe04a1c9..943fe04a1c9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.17/srcs.nix new file mode 100644 index 00000000000..8cf8d1bbad4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/srcs.nix @@ -0,0 +1,565 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + attica = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/attica-5.17.0.tar.xz"; + sha256 = "0n5f8754705ga3s158nn56haakajcpx7hms3pjn32jc1n95h06nf"; + name = "attica-5.17.0.tar.xz"; + }; + }; + baloo = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/baloo-5.17.0.tar.xz"; + sha256 = "01gkn69i63ppjrswpqw1vdfc590vn4xlld1zmjzprbfs2ryni2k0"; + name = "baloo-5.17.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/bluez-qt-5.17.0.tar.xz"; + sha256 = "1jh60gs2lqwg1x609lh3lrgqjfg179r40j59wgmzrm5bfvc5zsk5"; + name = "bluez-qt-5.17.0.tar.xz"; + }; + }; + breeze-icons = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/breeze-icons-5.17.0.tar.xz"; + sha256 = "120x15mps8gy4c4vzrcwvfcmjv7qka7q92lyqk76g70v6yh29q84"; + name = "breeze-icons-5.17.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/extra-cmake-modules-5.17.0.tar.xz"; + sha256 = "01blad3rwffsgd21xkkk653kbqv2gvh0ckmvpil9x9fc0w7gwmqs"; + name = "extra-cmake-modules-5.17.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/frameworkintegration-5.17.0.tar.xz"; + sha256 = "1f8clq6wszb74qal6402r66izansn9cz1x5j13v8ajwqb7rr8gvl"; + name = "frameworkintegration-5.17.0.tar.xz"; + }; + }; + kactivities = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kactivities-5.17.0.tar.xz"; + sha256 = "0lnx3kbgna9pq1bdzzygng0l7rkwyvr2gkxm5abhbw290dvq0xas"; + name = "kactivities-5.17.0.tar.xz"; + }; + }; + kapidox = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kapidox-5.17.0.tar.xz"; + sha256 = "1cd32n36w8hfggng61m50jflb9lpv4ba74aq1g64c1grbfjad3k1"; + name = "kapidox-5.17.0.tar.xz"; + }; + }; + karchive = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/karchive-5.17.0.tar.xz"; + sha256 = "1ry7vwgc1np9pw1b8791lji09n1y6afyifqlv112riifq7ljmld1"; + name = "karchive-5.17.0.tar.xz"; + }; + }; + kauth = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kauth-5.17.0.tar.xz"; + sha256 = "0v7vgh4hmfk3h3083jwx3n11xz22j6vn50naffzwwixqlrqa7qy3"; + name = "kauth-5.17.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kbookmarks-5.17.0.tar.xz"; + sha256 = "0rk70ag21lpym9lw4dd9rlq77lfi2v2y076g6000hhrqjnvdbcya"; + name = "kbookmarks-5.17.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kcmutils-5.17.0.tar.xz"; + sha256 = "176b8ai490ipc1p8zqzi3ymsqzazb7awgnrd81b4fr3fzcm3q8zh"; + name = "kcmutils-5.17.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kcodecs-5.17.0.tar.xz"; + sha256 = "12nic57sx69zvj9ihw3ifiwnf9giqq57kgp892kcz5q42wjqzvj3"; + name = "kcodecs-5.17.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kcompletion-5.17.0.tar.xz"; + sha256 = "0d8mx3kr29lp1fk0n8pmmzlzrw9fa3czayn46xdwf1dr2pjj4a2g"; + name = "kcompletion-5.17.0.tar.xz"; + }; + }; + kconfig = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kconfig-5.17.0.tar.xz"; + sha256 = "1kdagw6wisqnfj6iq77r0nkc04cvhj4n454s3w3az0bhk23b4nrj"; + name = "kconfig-5.17.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kconfigwidgets-5.17.0.tar.xz"; + sha256 = "0fvrk5ap4lr8i2nlphsy3z7kv39h28v33yja2r54pa4207kq4cy2"; + name = "kconfigwidgets-5.17.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kcoreaddons-5.17.0.tar.xz"; + sha256 = "0pd6siicagcjd4vbn30rhrlwy6r3iiyjpl2pim1njr6fvsb0687n"; + name = "kcoreaddons-5.17.0.tar.xz"; + }; + }; + kcrash = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kcrash-5.17.0.tar.xz"; + sha256 = "0v1v4ksfswc3fg7piqiw0fln30vilk5pbqq2wphbwbgn5im91m7d"; + name = "kcrash-5.17.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdbusaddons-5.17.0.tar.xz"; + sha256 = "1n4k97206v7hdkrd2p8vhy1bnr194zvamw3vpvhfxgq4pr4a96dm"; + name = "kdbusaddons-5.17.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdeclarative-5.17.0.tar.xz"; + sha256 = "12p5dkdww32d5gk71aw7x5xpa3gj1ag60vj17b9v3zmax0a2g84k"; + name = "kdeclarative-5.17.0.tar.xz"; + }; + }; + kded = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kded-5.17.0.tar.xz"; + sha256 = "1sly9dviv0q99045p13xswjr78x2x5fzwj4qad66w6cyv67i0khk"; + name = "kded-5.17.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/kdelibs4support-5.17.0.tar.xz"; + sha256 = "03i7r60zjd10cam0q0kld0x43a8fn281bgn25fysw7604f92x7rx"; + name = "kdelibs4support-5.17.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdesignerplugin-5.17.0.tar.xz"; + sha256 = "0v47sia41gsf9gaf5jgvfgf2wzszfa76abzplqrmlgvrymi1fk1z"; + name = "kdesignerplugin-5.17.0.tar.xz"; + }; + }; + kdesu = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdesu-5.17.0.tar.xz"; + sha256 = "188k34x4z1s948f3qdy4c5pascdzshrqnbsx0ppnjlgxhv8sx108"; + name = "kdesu-5.17.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdewebkit-5.17.0.tar.xz"; + sha256 = "1p3nanp1i09hpxp9gfvjyqcrfjf7ypxpfhpd381az96pjs35dixc"; + name = "kdewebkit-5.17.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdnssd-5.17.0.tar.xz"; + sha256 = "05njhdpmp28c46271laxjy87v6miwzf7xm1886b9q0v47cpin2p1"; + name = "kdnssd-5.17.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdoctools-5.17.0.tar.xz"; + sha256 = "0qbzj68rfg9xc3nabhrnaqm9ysgbrdhdgm8ag64ixk6b4x6hjmr8"; + name = "kdoctools-5.17.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kemoticons-5.17.0.tar.xz"; + sha256 = "0cxzjfsl1ph3nl6ycsgyaz22rb4nc15n2glcgnmrqchh67xxzv13"; + name = "kemoticons-5.17.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kfilemetadata-5.17.0.tar.xz"; + sha256 = "1a6865v1cz31i8a63hhjzp1lw5b78p0r7ypml6syxlblpg2y9mzh"; + name = "kfilemetadata-5.17.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kglobalaccel-5.17.0.tar.xz"; + sha256 = "0dm8xljqgxay98dcqdgvmhcf0fanv3iiw23nk4vyzis6n8nv04hz"; + name = "kglobalaccel-5.17.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kguiaddons-5.17.0.tar.xz"; + sha256 = "1r15ll4c27zp78p9i18izxrpmf41hynz16z0fmz8jgcdnxgx0d74"; + name = "kguiaddons-5.17.0.tar.xz"; + }; + }; + khtml = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/khtml-5.17.0.tar.xz"; + sha256 = "0mz5mb7mh2nxih2avy2ncmchlyzg8pignnl4lbr5cnfc7y79g7i4"; + name = "khtml-5.17.0.tar.xz"; + }; + }; + ki18n = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/ki18n-5.17.0.tar.xz"; + sha256 = "07chysr2x579ll6qwxmirmcy5b06wf0578l8xmvgc9q4wk0m0m73"; + name = "ki18n-5.17.0.tar.xz"; + }; + }; + kiconthemes = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kiconthemes-5.17.0.tar.xz"; + sha256 = "1fgwgwmrb0pav30s7wc30src92cvfw6cxqz2q14n5flz7kg1d0k3"; + name = "kiconthemes-5.17.0.tar.xz"; + }; + }; + kidletime = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kidletime-5.17.0.tar.xz"; + sha256 = "06ig3wca3k1kdq0w1pl5syvcgrrshyws6xal7qswr6vsf6jd7n95"; + name = "kidletime-5.17.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kimageformats-5.17.0.tar.xz"; + sha256 = "0dw007wc50fhgpm1sv8qxs3y8xwwgcz33nd8p7yg8bxqfgjmhzbs"; + name = "kimageformats-5.17.0.tar.xz"; + }; + }; + kinit = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kinit-5.17.0.tar.xz"; + sha256 = "18agcc5z8g0vsk97wh4p09185m5vz52wdsia7rg8f5fb4wkzrn5i"; + name = "kinit-5.17.0.tar.xz"; + }; + }; + kio = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kio-5.17.0.tar.xz"; + sha256 = "1dfh2kbp00kv5b94p4xjimh4fhlwmcgac7wsi1g2pvrbw7gsi48l"; + name = "kio-5.17.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kitemmodels-5.17.0.tar.xz"; + sha256 = "19zq1d7ymfzlz3nx4a9hvlfssa7x0rdh8pg8i9rchalals6239ny"; + name = "kitemmodels-5.17.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kitemviews-5.17.0.tar.xz"; + sha256 = "1k3f1j3sw86jl5y3ak767ldb2fraspldjh6i98926wingqq3y8p3"; + name = "kitemviews-5.17.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kjobwidgets-5.17.0.tar.xz"; + sha256 = "02j7fm0g0dc6grvgjhx269b5p4xil7k8z1m8amkjpc7v3j3vkyrw"; + name = "kjobwidgets-5.17.0.tar.xz"; + }; + }; + kjs = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/kjs-5.17.0.tar.xz"; + sha256 = "0988qcgiqc4mla3x12mb8xaw0mhy2kmdi94xw634az03mwghljh4"; + name = "kjs-5.17.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/kjsembed-5.17.0.tar.xz"; + sha256 = "0am27pdc2pdjisc82iinq68lw8r12a0zb9n6ywa1mlqbrvr5sqgs"; + name = "kjsembed-5.17.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/kmediaplayer-5.17.0.tar.xz"; + sha256 = "1idzbddyfrf05kbqqm1hcyy53qrnvg9sb0f29rqp33mq36y63rxg"; + name = "kmediaplayer-5.17.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/knewstuff-5.17.0.tar.xz"; + sha256 = "1ljr1syg7810ww0wlqq2p7xdqn9sfz7kkxr8vdw4627gjqr50l5s"; + name = "knewstuff-5.17.0.tar.xz"; + }; + }; + knotifications = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/knotifications-5.17.0.tar.xz"; + sha256 = "0k2g0vmlhandp9zihj5sbs06yanmpy06h2pq5d2hn569anvpxr0r"; + name = "knotifications-5.17.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/knotifyconfig-5.17.0.tar.xz"; + sha256 = "1lfa23vag5j294ry5c0n59rs04k1mb5yr7vi69al2pw6xmnkbw6n"; + name = "knotifyconfig-5.17.0.tar.xz"; + }; + }; + kpackage = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kpackage-5.17.0.tar.xz"; + sha256 = "03z3hcibzkzymva935gx39bbrl61jw8wnxqxh2f56z7qmm7sj9x7"; + name = "kpackage-5.17.0.tar.xz"; + }; + }; + kparts = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kparts-5.17.0.tar.xz"; + sha256 = "08dh17z5345gmvaacrllpx9zdfayndfxl8ykhzpp3gvx0ssrswwx"; + name = "kparts-5.17.0.tar.xz"; + }; + }; + kpeople = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kpeople-5.17.0.tar.xz"; + sha256 = "0d7j2j92r2iwkabnqm6f6wm5d4j69r4z1859pc9l4rhh4f0qy9g3"; + name = "kpeople-5.17.0.tar.xz"; + }; + }; + kplotting = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kplotting-5.17.0.tar.xz"; + sha256 = "0i8gcvf2fiaxxqjan1lil9is8v5bfd4yi9zyl7bzijcishckrkmx"; + name = "kplotting-5.17.0.tar.xz"; + }; + }; + kpty = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kpty-5.17.0.tar.xz"; + sha256 = "1csgwp9y33sfgzn4mwinqznfmsd2cm1iia6qm0xpmf8n39rassxc"; + name = "kpty-5.17.0.tar.xz"; + }; + }; + kross = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/kross-5.17.0.tar.xz"; + sha256 = "0bjkp8ibaw1zr71dbfz09qbaragmzh3slyp8mm6ypaixgfvprklx"; + name = "kross-5.17.0.tar.xz"; + }; + }; + krunner = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/krunner-5.17.0.tar.xz"; + sha256 = "0ghxbmkpi20kbrsn6kib3na3gdnsn5akfzazfwh8q00dhabhin4k"; + name = "krunner-5.17.0.tar.xz"; + }; + }; + kservice = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kservice-5.17.0.tar.xz"; + sha256 = "0nz46n6yj3h6ml0gvn2j7malvxn4p96q9xh9f2i7j1jwl3c5j4b8"; + name = "kservice-5.17.0.tar.xz"; + }; + }; + ktexteditor = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/ktexteditor-5.17.0.tar.xz"; + sha256 = "16shf6zq019pmg8avnlvn4l5w71h4y6v3511rckn8kqdrz3wb4pr"; + name = "ktexteditor-5.17.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/ktextwidgets-5.17.0.tar.xz"; + sha256 = "1940a2s084hwf359rr3vrlzdz09iyn3nlpch24wgff728i28mc73"; + name = "ktextwidgets-5.17.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kunitconversion-5.17.0.tar.xz"; + sha256 = "0yc3k0d91m5ql75azabqqsihy3hai3x0hzwby8wwm5by20mq1bjf"; + name = "kunitconversion-5.17.0.tar.xz"; + }; + }; + kwallet = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kwallet-5.17.0.tar.xz"; + sha256 = "0552cd4m6nf439vrbwljxmb030h1ndmldvnl4p5r0g8h8jd12siv"; + name = "kwallet-5.17.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kwidgetsaddons-5.17.0.tar.xz"; + sha256 = "151jywz4z375kgx362i39gf5xb7fdayz9kly738vzwx4vx253xvn"; + name = "kwidgetsaddons-5.17.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kwindowsystem-5.17.0.tar.xz"; + sha256 = "180b567ixiv487fdw2hp0jgs7cckm8f82y0mny5zvi25l39gjq54"; + name = "kwindowsystem-5.17.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kxmlgui-5.17.0.tar.xz"; + sha256 = "0rbxk9f918wmq1ijxcpjf6rl31p1f0f85f8rjk5aln3gh65b1zdn"; + name = "kxmlgui-5.17.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kxmlrpcclient-5.17.0.tar.xz"; + sha256 = "1zj7c6b72cnnkds73938xyy87padbv0ah3jfqxdfb1yd5zxba7cs"; + name = "kxmlrpcclient-5.17.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/modemmanager-qt-5.17.0.tar.xz"; + sha256 = "1q3abgr527lcrzy40anm3sjy9j8ycga4g1gkqz201lwa1wp22zr3"; + name = "modemmanager-qt-5.17.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/networkmanager-qt-5.17.0.tar.xz"; + sha256 = "08aafz3y2lnnl5dmzj4s1nfjwhy3mda20pkxjyw1vk8l3s8nhs1l"; + name = "networkmanager-qt-5.17.0.tar.xz"; + }; + }; + oxygen-icons5 = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/oxygen-icons5-5.17.0.tar.xz"; + sha256 = "18m5hfz4zappnz45f230sgjbl52fsjxli6d5dvm6998bhcyvv1y9"; + name = "oxygen-icons5-5.17.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/plasma-framework-5.17.0.tar.xz"; + sha256 = "0pi91pg9h0s4xziw9m8mc65b8ryhgjnv14zalmbwyr63qn7bkfjh"; + name = "plasma-framework-5.17.0.tar.xz"; + }; + }; + solid = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/solid-5.17.0.tar.xz"; + sha256 = "1igdqk5cgrxq4is55zdskkc0kbcyp9vjfdrvr9xxhs0lxgizccx3"; + name = "solid-5.17.0.tar.xz"; + }; + }; + sonnet = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/sonnet-5.17.0.tar.xz"; + sha256 = "0f7bzdcknc7kc4133q0c3zc1j78yf29kh8i7c0qg01zv1iafbbsv"; + name = "sonnet-5.17.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/threadweaver-5.17.0.tar.xz"; + sha256 = "1cf7qrzw4saai0z6l7bzhfc8clhngcgxla5zbpj28l6130lha8sw"; + name = "threadweaver-5.17.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix index 52817921cc7..52817921cc7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix new file mode 100644 index 00000000000..793c4992c3f --- /dev/null +++ b/pkgs/development/libraries/libb64/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "libb64-${version}"; + version = "1.2"; + + src = fetchurl { + url = "http://download.draios.com/dependencies/libb64-1.2.src.zip"; + md5 = "a609809408327117e2c643bed91b76c5"; + }; + + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out $out/lib $out/bin $out/include + cp -r include/* $out/include/ + cp base64/base64 $out/bin/ + cp src/libb64.a src/cencode.o src/cdecode.o $out/lib/ + ''; + + meta = { + inherit version; + description = "ANSI C routines for fast base64 encoding/decoding"; + license = stdenv.lib.licenses.publicDomain; + }; +} diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix deleted file mode 100644 index 5f76162453c..00000000000 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchbzr, qt5, cmake }: - -stdenv.mkDerivation { - name = "libdbusmenu-qt-0.9.3+14"; - - src = fetchbzr { - url = "http://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk"; - rev = "ps-jenkins@lists.canonical.com-20140619090718-mppiiax5atpnb8i2"; - sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd"; - }; - - buildInputs = [ qt5.base ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = "-DWITH_DOC=OFF"; - - meta = with stdenv.lib; { - homepage = "http://launchpad.net/libdbusmenu-qt"; - description = "Provides a Qt implementation of the DBusMenu spec"; - maintainers = [ maintainers.ttuegel ]; - inherit (qt5.base.meta) platforms; - }; -} diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 816b9728cc9..962f716c120 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, dejagnu, doCheck ? false }: stdenv.mkDerivation rec { name = "libffi-3.2.1"; @@ -12,11 +12,15 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" "doc" ]; + buildInputs = stdenv.lib.optional doCheck dejagnu; + configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" ]; + inherit doCheck; + dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling. # Install headers and libs in the right places. diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 661a5c8b8ca..6853c9a2ef0 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool, makeWrapper , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex -, gmp, readline, file, libintlperl, GetoptLong, SysVirt }: +, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen }: stdenv.mkDerivation rec { name = "libguestfs-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeWrapper pkgconfig autoconf automake libtool ncurses cpio gperf perl cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong - SysVirt + SysVirt numactl xen ]; configureFlags = "--disable-appliance --disable-daemon"; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index d9619fd2712..5fbc6bb1dbf 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.79"; + version = "0.7.80"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0lanhx1zg7s36wgi9ndv4zz7dbhkqz4dc99mva6x9rcj2p5p8c6d"; + sha256 = "0v9px37qx0dkx67gqwi1rd9x4m7zm1ml8sdj5fx0isj6qymbd1z5"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 8f46d1c0bfd..479a187cf87 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-nss" ]; + postInstall = '' + substituteInPlace $out/lib/liboauth.la \ + --replace "-lnss3" "-L${nss}/lib -lnss3" + ''; + meta = with stdenv.lib; { platforms = platforms.linux; description = "C library implementing the OAuth secure authentication protocol"; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 7c103d76bd5..83873cc3660 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libosinfo-0.2.11"; + name = "libosinfo-0.2.12"; src = fetchurl { url = "https://fedorahosted.org/releases/l/i/libosinfo/${name}.tar.gz"; - sha256 = "0889zvidhmpk3nd7c1xhh3fkk9i014dkr6zdlddh89kbflva2sxv"; + sha256 = "1vcg8ylh7q69s9y6hj94dqfffwfbann3i28yqgfc01navf6yl07s"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 6e7481805e7..01e90cb1913 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -3,11 +3,11 @@ assert !(stdenv ? cross) -> zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.2.54"; + name = "libpng-1.2.55"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "0wnjy7gqn0f24qrlggs7kl0ij59by413j1xmqp12n3vqh9j531fg"; + sha256 = "0zkra0b9lrpk2axassdgkqinmc2ba6b473sm52xbpyknaqs2fljy"; }; outputs = [ "dev" "out" "man" ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 00abbbbdca4..6faed97aaee 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; let - version = "1.6.19"; - sha256 = "1s1mmkl79ghiczi2x2rbnp6y70v4c5pr8g3icxn9h5imymbmc71i"; + version = "1.6.20"; + sha256 = "12wis4rlisfnw79pj2778m42m94xpi9nq8m385hxk11lkyg9biam"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "0bgqkac16yhl0zwjzq2zwkixg2l2x3a6blbk3k0wqz0lza2a6jrh"; + sha256 = "11xgal9qk6fmqdgcb37xg55f2y58wizszw54p1pyq855d2xpwfz6"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 4058943b6f3..1412e1d59fa 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -5,10 +5,10 @@ let version = "${libVersion}-list-${listVersion}"; - listVersion = "2015-12-03"; + listVersion = "2015-12-17"; listSources = fetchFromGitHub { - sha256 = "1192g8x57pm9r3va1xfvni0jczg8wy5kka6vcwnvc3lk4314l2na"; - rev = "6c137ba598d61f2ea299632bb447608a9fc25d0f"; + sha256 = "09scxqlw7cp7vkjn7bp7dr9nqb3wg84kvw3iyapyxddfri4k0rvl"; + rev = "9636089f5f22b0af98b1a48fb9179dc875f0872d"; repo = "list"; owner = "publicsuffix"; }; diff --git a/pkgs/development/libraries/libressl/2.2.nix b/pkgs/development/libraries/libressl/2.2.nix index fd18c7f5652..89e7e6507e4 100644 --- a/pkgs/development/libraries/libressl/2.2.nix +++ b/pkgs/development/libraries/libressl/2.2.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0zlsxw366n438dc14zqnim6fc5vh1574jj95hv1sym46prcrhh3b"; + sha256 = "0jwidi7fafcdh5qml72dx0ad0kfsk94qxzm29i7wd3cx8v8dxjp3"; }; enableParallelBuilding = true; @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Free TLS/SSL implementation"; homepage = "http://www.libressl.org"; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington fpletz ]; + maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; }; } diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 356891e7351..9efe07c6567 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.2.4"; + version = "3.3.2"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "1v804r7k0iv97ihlr46hwfw88v874kfklsm616b85yzdz0105i8h"; + sha256 = "affb7efaa7e152e576cc1d510c662ebe067b0b9e9228ad2937dcafdd4431b573"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index ae1f0e41448..ae83ce78d5f 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,36 +1,21 @@ { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl -, nettle, libgcrypt, python, pygobject, gobjectIntrospection, libcap_ng +, nettle, libgcrypt, python, pygobject, gobjectIntrospection, libcap_ng, numactl +, xen }: stdenv.mkDerivation rec { - name = "libvirt-glib-0.2.0"; + name = "libvirt-glib-0.2.3"; src = fetchurl { url = "http://libvirt.org/sources/glib/${name}.tar.gz"; - sha256 = "02saqkk4wzsimsan7s9yc5bx05xn7j00hnxhq4sczkgr4krf1drh"; + sha256 = "1pahj8qa7k2307sd57rwqwq1hijya02v0sxk91hl3cw48niimcf3"; }; buildInputs = [ pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject gobjectIntrospection libcap_ng + python pygobject gobjectIntrospection libcap_ng numactl xen ]; - # Compiler flag -fstack-protector-all fixes this build error: - # - # ./.libs/libvirt-glib-1.0.so: undefined reference to `__stack_chk_guard' - # - # And the extra include path fixes this build error: - # - # In file included from ../libvirt-gobject/libvirt-gobject-domain-device.h:30:0, - # from /tmp/nix-build-libvirt-glib-0.1.7.drv-2/libvirt-glib-0.1.7/libvirt-gobject/libvirt-gobject.h:33, - # from <stdin>:4: - # ../libvirt-gobject/libvirt-gobject-domain.h:33:29: fatal error: libvirt/libvirt.h: No such file or directory - # compilation terminated. - # make[3]: *** [LibvirtGObject-1.0.gir] Error 1 - preConfigure = '' - export NIX_CFLAGS_COMPILE="-fstack-protector-all -I${libvirt}/include" - ''; - meta = with stdenv.lib; { description = "Library for working with virtual machines"; longDescription = '' diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index a8295380829..c947758b979 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,16 +1,13 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng -, dnsmasq, libnl, libpcap, libxslt, xhtml1 -, pythonPackages, perlPackages +, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages +, curl, libiconv, gmp, xen }: -let version = "1.2.19"; in - -assert version == pythonPackages.libvirt.version; - stdenv.mkDerivation rec { name = "libvirt-${version}"; + version = "1.2.19"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; @@ -18,23 +15,40 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 - utillinux systemd.udev.lib libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper - libcap_ng libnl libxslt xhtml1 perlPackages.XMLXPath + pkgconfig libxml2 gnutls perl python readline + gettext libtasn1 libgcrypt yajl makeWrapper + libxslt xhtml1 perlPackages.XMLXPath curl libpcap + ] ++ stdenv.lib.optionals stdenv.isLinux [ + libpciaccess devicemapper lvm2 utillinux systemd.udev.lib libcap_ng + libnl numad numactl xen + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv gmp ]; - preConfigure = '' - PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${systemd.udev.bin}/sbin:${dnsmasq}/bin:$PATH + preConfigure = stdenv.lib.optionalString stdenv.isLinux '' + PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${systemd.udev.bin}/bin:$PATH + substituteInPlace configure --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' + '' + '' + PATH=${dnsmasq}/bin:$PATH patchShebangs . # fixes /usr/bin/python references ''; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" - "--with-init-script=redhat" + "--with-libpcap" + "--with-vmware" + "--with-vbox" + "--with-test" + "--with-esx" + "--with-remote" + ] ++ stdenv.lib.optionals stdenv.isLinux [ + "--with-numad" "--with-macvtap" "--with-virtualport" - "--with-libpcap" + "--with-init-script=redhat" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "--with-init-script=none" ]; installFlags = [ @@ -46,8 +60,9 @@ stdenv.mkDerivation rec { sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh substituteInPlace $out/libexec/libvirt-guests.sh \ --replace "$out/bin" "${gettext}/bin" + '' + stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/sbin/libvirtd \ - --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin + --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin:${numad}/bin:${numactl}/bin ''; enableParallelBuilding = true; @@ -62,6 +77,6 @@ stdenv.mkDerivation rec { versions of Linux (and other OSes) ''; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 3386de316b9..3596a994baf 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -23,7 +23,7 @@ else with { inherit (stdenv.lib) optional optionalString; }; let - version = "11.0.5"; + version = "11.0.8"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -33,10 +33,12 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" + (with stdenv.lib; ''ftp://ftp.freedesktop.org/pub/mesa/older-versions/'' + + head (splitString "." version) + ''.x/${version}/mesa-${version}.tar.xz'') + "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "9c255a2a6695fcc6ef4a279e1df0aeaf417dc142f39ee59dfb533d80494bb67a"; + sha256 = "5696e4730518b6805d2ed5def393c4293f425a2c2c01bd5ed4bdd7ad62f7ad75"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mlt/qt-5.4.nix b/pkgs/development/libraries/mlt/qt-5.4.nix deleted file mode 100644 index 6f308a20fdc..00000000000 --- a/pkgs/development/libraries/mlt/qt-5.4.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate -, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt5, sox -}: - -stdenv.mkDerivation rec { - name = "mlt-${version}"; - version = "0.9.8"; - - src = fetchurl { - url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "0x0hsb05i7g70dh3jll41qlvcylailfgsr0y1dpx7hyigynxc50j"; - }; - - buildInputs = [ - SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkgconfig qt5.base qt5.svg sox - ]; - - # Mostly taken from: - # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine - configureFlags = [ - "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3" - "--enable-opengl" - ]; - - enableParallelBuilding = true; - - postInstall = '' - wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 - ''; - - meta = with stdenv.lib; { - description = "Open source multimedia framework, designed for television broadcasting"; - homepage = http://www.mltframework.org/; - license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/mlt/qt-5.5.nix b/pkgs/development/libraries/mlt/qt-5.nix index d66d3fe9372..d66d3fe9372 100644 --- a/pkgs/development/libraries/mlt/qt-5.5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index b0261194414..9a1b5e31345 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.10.10"; in +let version = "4.11"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107"; + sha256 = "cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch index d20572a051e..3e51e290887 100644 --- a/pkgs/development/libraries/nss/85_security_load.patch +++ b/pkgs/development/libraries/nss/85_security_load.patch @@ -48,7 +48,7 @@ diff -ru nss-3.16-orig/nss/lib/util/secload.c nss-3.16/nss/lib/util/secload.c + if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0] + * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */ + referencePath = NIX_NSS_LIBDIR; -+ c = &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */ ++ c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */ + } if (c) { size_t referencePathSize = 1 + c - referencePath; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 12c44c4cae0..96326bf1df0 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.20.1"; + version = "3.21"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_1_RTM/src/${name}.tar.gz"; - sha256 = "ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/${name}.tar.gz"; + sha256 = "3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239"; }; buildInputs = [ nspr perl zlib sqlite ]; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ''; patches = - [ ./nss-3.17-gentoo-fixups.patch + [ ./nss-3.21-gentoo-fixups.patch # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch ./85_security_load.patch ]; @@ -59,6 +59,8 @@ in stdenv.mkDerivation rec { "NSS_USE_SYSTEM_SQLITE=1" ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; + NIX_CFLAGS_COMPILE = "-Wno-error"; + postInstall = '' rm -rf $out/private mv $out/public $out/include diff --git a/pkgs/development/libraries/nss/nss-3.17-gentoo-fixups.patch b/pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch index 7948fc07150..33819821c19 100644 --- a/pkgs/development/libraries/nss/nss-3.17-gentoo-fixups.patch +++ b/pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch @@ -1,5 +1,6 @@ ---- nss-3.17.1/nss/config/Makefile -+++ nss-3.17.1/nss/config/Makefile +diff -urN a/nss/config/Makefile b/nss/config/Makefile +--- a/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ b/nss/config/Makefile 2015-11-15 10:42:46.249578304 -0600 @@ -0,0 +1,40 @@ +CORE_DEPTH = .. +DEPTH = .. @@ -41,8 +42,9 @@ + +dummy: all export libs + ---- nss-3.17.1/nss/config/nss-config.in -+++ nss-3.17.1/nss/config/nss-config.in +diff -urN a/nss/config/nss-config.in b/nss/config/nss-config.in +--- a/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 ++++ b/nss/config/nss-config.in 2015-11-15 10:42:46.250578304 -0600 @@ -0,0 +1,145 @@ +#!/bin/sh + @@ -189,8 +191,9 @@ + echo $libdirs +fi + ---- nss-3.17.1/nss/config/nss.pc.in -+++ nss-3.17.1/nss/config/nss.pc.in +diff -urN a/nss/config/nss.pc.in b/nss/config/nss.pc.in +--- a/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ b/nss/config/nss.pc.in 2015-11-15 10:42:46.251578304 -0600 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -201,12 +204,13 @@ +Description: Network Security Services +Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ +Requires: nspr >= 4.8 -+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 ++Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Cflags: -I${includedir} + ---- nss-3.17.1/nss/Makefile -+++ nss-3.17.1/nss/Makefile -@@ -44,7 +44,7 @@ +diff -urN a/nss/Makefile b/nss/Makefile +--- a/nss/Makefile 2015-11-15 09:25:06.410786060 -0600 ++++ b/nss/Makefile 2015-11-15 10:42:46.252578304 -0600 +@@ -46,7 +46,7 @@ # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### @@ -215,7 +219,7 @@ nss_clean_all: clobber_nspr clobber -@@ -109,12 +109,6 @@ +@@ -115,12 +115,6 @@ --with-dist-prefix='$(NSPR_PREFIX)' \ --with-dist-includedir='$(NSPR_PREFIX)/include' @@ -228,14 +232,12 @@ build_docs: $(MAKE) -C $(CORE_DEPTH)/doc ---- nss-3.17.1/nss/manifest.mn -+++ nss-3.17.1/nss/manifest.mn -@@ -10,7 +10,7 @@ +diff -urN a/nss/manifest.mn b/nss/manifest.mn +--- a/nss/manifest.mn 2015-11-15 09:25:06.411786060 -0600 ++++ b/nss/manifest.mn 2015-11-15 10:43:15.633576994 -0600 +@@ -10,4 +10,4 @@ RELEASE = nss --DIRS = coreconf lib cmd +-DIRS = coreconf lib cmd external_tests +DIRS = coreconf lib cmd config - - ifdef NSS_BUILD_GTESTS - DIRS += external_tests diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 2b4d11919fb..dd40311b807 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchgit, cmake, opencv, qtbase, qtsvg }: +{ stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }: stdenv.mkDerivation rec { version = "0.5"; name = "openbr-${version}"; - src = fetchgit { - url = "https://github.com/biometrics/openbr.git"; + src = fetchFromGitHub { + owner = "biometrics"; + repo = "openbr"; rev = "cc364a89a86698cd8d3052f42a3cb520c929b325"; - sha256 = "16b3mmsf9r1yqqaw89fx0c3bgfg86dz4phry89wqy2hw05szgda3"; + sha256 = "12y00cf5dlzp9ciiwbihf6xhlkdxpydhscv5hwp83qjdllid9rrz"; }; buildInputs = [ opencv qtbase qtsvg ]; diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 5dfd87c4d84..d84f9e75510 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -1,13 +1,21 @@ -{stdenv, fetchurl, openssl, libmilter}: +{stdenv, fetchurl, openssl, libmilter, libbsd}: stdenv.mkDerivation rec { - name = "opendkim-2.4.3"; + name = "opendkim-2.10.3"; src = fetchurl { url = "mirror://sourceforge/opendkim/files/${name}.tar.gz"; - sha256 = "01h97h012gcp8rimjbc9mrv4759cnw4flb42ddiady1bmb2p7vy3"; + sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823"; }; configureFlags="--with-openssl=${openssl} --with-milter=${libmilter}"; - buildInputs = [openssl libmilter]; + buildInputs = [openssl libmilter libbsd]; + + meta = { + description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service"; + homepage = http://opendkim.org/; + maintainers = [ ]; + platforms = with stdenv.lib.platforms; all; + }; + } diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix deleted file mode 100644 index 9d1e6e72853..00000000000 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, cmake, gst_all_1, phonon_qt5, pkgconfig, qt5, debug ? false }: - -with stdenv.lib; - -let - version = "4.8.2"; - pname = "phonon-backend-gstreamer"; -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; - }; - - buildInputs = with gst_all_1; [ - gstreamer gst-plugins-base phonon_qt5 qt5.base - ]; - - NIX_CFLAGS_COMPILE = [ - # This flag should be picked up through pkgconfig, but it isn't. - "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" - "-fPIC" - ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DPHONON_BUILD_PHONON4QT5=ON" - ] - ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = with stdenv.lib; { - homepage = http://phonon.kde.org/; - description = "GStreamer backend for Phonon"; - platforms = platforms.linux; - maintainer = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/phonon/qt5/old.nix b/pkgs/development/libraries/phonon/qt5/old.nix deleted file mode 100644 index 3dddd60b59f..00000000000 --- a/pkgs/development/libraries/phonon/qt5/old.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio, qt5, debug ? false }: - -with stdenv.lib; - -let - v = "4.8.3"; -in - -stdenv.mkDerivation rec { - name = "phonon-${v}"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz"; - sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"; - }; - - buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools libpulseaudio ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - NIX_CFLAGS_COMPILE = "-fPIC"; - - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" - "-DPHONON_BUILD_PHONON4QT5=ON" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - meta = { - homepage = http://phonon.kde.org/; - description = "Multimedia API for Qt"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/polkit-qt-1/old.nix b/pkgs/development/libraries/polkit-qt-1/old.nix deleted file mode 100644 index b887134e5b9..00000000000 --- a/pkgs/development/libraries/polkit-qt-1/old.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib -, qt4 ? null, qt5 ? null, withQt5 ? false }: - -assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); - -stdenv.mkDerivation { - name = "polkit-qt-1-0.112.0"; - - src = fetchurl { - url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2"; - sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; - }; - - nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - - propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]); - - meta = { - description = "A Qt wrapper around PolKit"; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/qca-qt5/old.nix b/pkgs/development/libraries/qca-qt5/old.nix deleted file mode 100644 index a3e9e9be642..00000000000 --- a/pkgs/development/libraries/qca-qt5/old.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, cmake, openssl, pkgconfig, qt5 }: - -stdenv.mkDerivation rec { - name = "qca-qt5-2.1.1"; - - src = fetchurl { - url = "http://download.kde.org/stable/qca/2.1.1/src/qca-2.1.1.tar.xz"; - sha256 = "10z9icq28fww4qbzwra8d9z55ywbv74qk68nhiqfrydm21wkxplm"; - }; - - buildInputs = [ openssl qt5.base ]; - nativeBuildInputs = [ cmake pkgconfig ]; - - meta = with stdenv.lib; { - description = "Qt 5 Cryptographic Architecture"; - homepage = http://delta.affinix.com/qca; - maintainers = with maintainers; [ ttuegel ]; - license = licenses.lgpl21Plus; - }; -} diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 43ef6f78b57..4e6b50502d6 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ ./libressl.patch ]; + meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; diff --git a/pkgs/development/libraries/qca2/libressl.patch b/pkgs/development/libraries/qca2/libressl.patch new file mode 100644 index 00000000000..c9b0267f85d --- /dev/null +++ b/pkgs/development/libraries/qca2/libressl.patch @@ -0,0 +1,28 @@ +--- a/plugins/qca-ossl/qca-ossl.cpp 2015-12-02 09:34:25.810682094 +0000 ++++ b/plugins/qca-ossl/qca-ossl.cpp 2015-12-02 09:29:51.720392423 +0000 +@@ -5403,11 +5403,13 @@ + ctx = SSL_CTX_new(SSLv2_client_method()); + break; + #endif ++#ifndef OPENSSL_NO_SSL3 + case TLS::SSL_v3: + ctx = SSL_CTX_new(SSLv3_client_method()); + break; ++#endif + case TLS::TLS_v1: ++ ctx = SSL_CTX_new(SSLv23_client_method()); +- ctx = SSL_CTX_new(TLSv1_client_method()); + break; + case TLS::DTLS_v1: + default: +@@ -7133,8 +7135,10 @@ + return new opensslInfoContext(this); + else if ( type == "sha1" ) + return new opensslHashContext( EVP_sha1(), this, type); ++#ifndef OPENSSL_NO_SHA0 + else if ( type == "sha0" ) + return new opensslHashContext( EVP_sha(), this, type); ++#endif + else if ( type == "ripemd160" ) + return new opensslHashContext( EVP_ripemd160(), this, type); + #ifdef HAVE_OPENSSL_MD2 diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index ccc486692e2..39cfd745be5 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { patches = [ ./glib-2.32.patch + ./libressl.patch (substituteAll { src = ./dlopen-absolute-paths.diff; cups = cups.out; diff --git a/pkgs/development/libraries/qt-4.x/4.8/libressl.patch b/pkgs/development/libraries/qt-4.x/4.8/libressl.patch new file mode 100644 index 00000000000..5432610d9dc --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/libressl.patch @@ -0,0 +1,64 @@ +$OpenBSD: patch-src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.3 2015/09/17 12:24:42 dcoppa Exp $ +--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp Wed Sep 16 13:27:39 2015 ++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp Wed Sep 16 13:33:06 2015 +@@ -228,13 +228,17 @@ DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, re + #ifndef OPENSSL_NO_SSL2 + DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) + #endif ++#ifndef OPENSSL_NO_SSL3 + DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif + DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) + #ifndef OPENSSL_NO_SSL2 + DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) + #endif ++#ifndef OPENSSL_NO_SSL3 + DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif + DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) + #else +@@ -822,13 +826,17 @@ bool q_resolveOpenSslSymbols() + #ifndef OPENSSL_NO_SSL2 + RESOLVEFUNC(SSLv2_client_method) + #endif ++#ifndef OPENSSL_NO_SSL3 + RESOLVEFUNC(SSLv3_client_method) ++#endif + RESOLVEFUNC(SSLv23_client_method) + RESOLVEFUNC(TLSv1_client_method) + #ifndef OPENSSL_NO_SSL2 + RESOLVEFUNC(SSLv2_server_method) + #endif ++#ifndef OPENSSL_NO_SSL3 + RESOLVEFUNC(SSLv3_server_method) ++#endif + RESOLVEFUNC(SSLv23_server_method) + RESOLVEFUNC(TLSv1_server_method) + RESOLVEFUNC(X509_NAME_entry_count) +--- a/src/network/ssl/qsslsocket_openssl.cpp Thu May 7 16:14:44 2015 ++++ b/src/network/ssl/qsslsocket_openssl.cpp Wed Sep 16 13:30:03 2015 +@@ -267,15 +267,19 @@ init_context: + #endif + break; + case QSsl::SslV3: ++#ifndef OPENSSL_NO_SSL3 + ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); ++#else ++ ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error ++#endif + break; +- case QSsl::SecureProtocols: // SslV2 will be disabled below +- case QSsl::TlsV1SslV3: // SslV2 will be disabled below + case QSsl::AnyProtocol: +- default: + ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); + break; + case QSsl::TlsV1: ++ case QSsl::SecureProtocols: ++ case QSsl::TlsV1SslV3: ++ default: + ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method()); + break; + } diff --git a/pkgs/development/libraries/qt-5/5.4/0003-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.4/0003-glib-2.32.patch deleted file mode 100644 index 4abb69da4d8..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/0003-glib-2.32.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a41c3e3a3a1ce4b373b1bbb98f3a835e9e8a0718 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:22:39 -0600 -Subject: [PATCH] glib-2.32 - ---- - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -index 1f6d25e..087c3fb 100644 ---- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -+++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -@@ -81,7 +81,7 @@ - #include <pthread.h> - #elif PLATFORM(GTK) - #include <wtf/gtk/GOwnPtr.h> --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.4/0004-dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.4/0004-dlopen-resolv.patch deleted file mode 100644 index e6b921b771d..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/0004-dlopen-resolv.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 63af41c6eeca28c911c13b1a77afeaf860863c2d Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:22:55 -0600 -Subject: [PATCH] dlopen-resolv - ---- - qtbase/src/network/kernel/qdnslookup_unix.cpp | 2 +- - qtbase/src/network/kernel/qhostinfo_unix.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtbase/src/network/kernel/qdnslookup_unix.cpp b/qtbase/src/network/kernel/qdnslookup_unix.cpp -index 8c5a0eb..27ebf16 100644 ---- a/qtbase/src/network/kernel/qdnslookup_unix.cpp -+++ b/qtbase/src/network/kernel/qdnslookup_unix.cpp -@@ -87,7 +87,7 @@ static void resolveLibrary() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc/lib/resolv")); - if (!lib.load()) - return; - } -diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp -index df8c8b1..613d0e0 100644 ---- a/qtbase/src/network/kernel/qhostinfo_unix.cpp -+++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp -@@ -103,7 +103,7 @@ static void resolveLibrary() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); - if (!lib.load()) - return; - } --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.4/0005-dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.4/0005-dlopen-gl.patch deleted file mode 100644 index d112427bdd6..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/0005-dlopen-gl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6aaf6858bf817172a4c503158e1701c4837ee790 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:23:08 -0600 -Subject: [PATCH] dlopen-gl - ---- - qtbase/src/plugins/platforms/xcb/qglxintegration.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp -index 67235e0..2220a2e 100644 ---- a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp -+++ b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp -@@ -434,7 +434,7 @@ void (*QGLXContext::getProcAddress(const QByteArray &procName)) () - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -- QLibrary lib(QLatin1String("GL")); -+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.4/0010-dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.4/0010-dlopen-libXcursor.patch deleted file mode 100644 index 49ade86fae3..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/0010-dlopen-libXcursor.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b56e3737ca97e3de664603976989da4419297eb3 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:33:51 -0600 -Subject: [PATCH] dlopen-libXcursor - ---- - qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -index 6dbac90..4b23fc2 100644 ---- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -305,10 +305,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) - #ifdef XCB_USE_XLIB - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch deleted file mode 100644 index 77eb7bc85af..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/qtbase/src/dbus/qdbus_symbols.cpp b/qtbase/src/dbus/qdbus_symbols.cpp -index 6764309..33f25f9 100644 ---- a/qtbase/src/dbus/qdbus_symbols.cpp -+++ b/qtbase/src/dbus/qdbus_symbols.cpp -@@ -88,7 +88,7 @@ bool qdbus_loadLibDBus() - #ifdef Q_OS_WIN - QLatin1String("dbus-1"), - #endif -- QLatin1String("libdbus-1") -+ QLatin1String("@dbus_libs@/lib/libdbus-1") - }; - - lib->unload(); diff --git a/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch deleted file mode 100644 index 4ec1947f6f9..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch +++ /dev/null @@ -1,17 +0,0 @@ -Ensure Qt knows where libGL is. - -Author: Bjørn Forsman <bjorn.forsman@gmail.com> -diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf ---- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200 -+++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200 -@@ -12,8 +12,8 @@ - QMAKE_LIBDIR = - QMAKE_INCDIR_X11 = - QMAKE_LIBDIR_X11 = --QMAKE_INCDIR_OPENGL = --QMAKE_LIBDIR_OPENGL = -+QMAKE_INCDIR_OPENGL = @mesa_inc@/include -+QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib - QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL - QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL - QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch b/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch deleted file mode 100644 index 4607274de74..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp -index 8833e3f..c56d381 100644 ---- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp -+++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp -@@ -47,7 +47,7 @@ - ****************************************************************************/ - - //#define QSSLSOCKET_DEBUG --//#define QT_DECRYPT_SSL_TRAFFIC -+#define QT_DECRYPT_SSL_TRAFFIC - - #include "qssl_p.h" - #include "qsslsocket_openssl_p.h" diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index 5807e685872..9b1324d1137 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -1,8 +1,8 @@ # Maintainer's Notes: # # Minor updates: -# 1. Edit ./manifest.sh to point to the updated URL. -# 2. Run ./manifest.sh. +# 1. Edit ./fetchsrcs.sh to point to the updated URL. +# 2. Run ./fetchsrcs.sh. # 3. Build and enjoy. # # Major updates: @@ -11,357 +11,106 @@ # if it exists. Then follow the minor update instructions. Be sure to check if # any new components have been added and package them as necessary. -{ autonix, fetchurl, newScope, stdenv - -, bison2 -, mesa_noglu -, libudev -, cups -, gnome +{ pkgs # options , developerBuild ? false , decryptSslTraffic ? false }: -with autonix; +let inherit (pkgs) makeSetupHook makeWrapper stdenv; in + with stdenv.lib; let - srcs = - let - manifest = builtins.fromJSON (builtins.readFile ./manifest.json); - mirror = "http://download.qt.io"; - fetch = src: fetchurl (src // { url = "${mirror}/${src.url}"; }); - mkPair = pkg: nameValuePair (builtins.parseDrvName pkg.name).name (fetch pkg.src); - pairs = map mkPair manifest; - in listToAttrs pairs; - - version = "5.4.2"; - - callPackage = newScope (self // { inherit qtSubmodule; }); - - qtSubmodule = callPackage ./qt-submodule.nix { - inherit srcs version; - inherit (stdenv) mkDerivation; - }; - - self = - { - - activeqt = callPackage - ( - { qtSubmodule, base }: - qtSubmodule { - name = "qtactiveqt"; - qtInputs = [ base ]; - } - ) - {}; + mirror = "http://download.qt.io"; + srcs = import ./srcs.nix { inherit mirror; inherit (pkgs) fetchurl; }; - /* androidextras = not packaged */ + qtSubmodule = args: + let + inherit (args) name; + inherit (srcs."${args.name}") version src; + inherit (pkgs.stdenv) mkDerivation; + in mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); + + NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; + dontAddPrefix = args.dontAddPrefix or true; + dontFixLibtool = args.dontFixLibtool or true; + configureScript = args.configureScript or "qmake"; + + enableParallelBuilding = args.enableParallelBuilding or true; + + meta = { + homepage = http://qt-project.org; + description = "A cross-platform application framework for C++"; + license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; + maintainers = with maintainers; [ bbenoist qknight ttuegel ]; + platforms = platforms.linux; + } // (args.meta or {}); + }); + + addPackages = self: with self; + let + callPackage = self.newScope { inherit qtSubmodule srcs; }; + in { - base = callPackage ./qtbase.nix { - mesa = mesa_noglu; - cups = if stdenv.isLinux then cups else null; + qtbase = callPackage ./qtbase { + mesa = pkgs.mesa_noglu; + cups = if stdenv.isLinux then pkgs.cups else null; # GNOME dependencies are not used unless gtkStyle == true - inherit (gnome) libgnomeui GConf gnome_vfs; - bison = bison2; # error: too few arguments to function 'int yylex(... - inherit developerBuild srcs version decryptSslTraffic; + inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; + bison = pkgs.bison2; # error: too few arguments to function 'int yylex(... + inherit developerBuild decryptSslTraffic; }; - connectivity = callPackage - ( - { qtSubmodule, base, declarative }: - - qtSubmodule { - name = "qtconnectivity"; - qtInputs = [ base declarative ]; - } - ) - {}; - - declarative = callPackage - ( - { qtSubmodule, python, base, svg, xmlpatterns }: - - qtSubmodule { - name = "qtdeclarative"; - qtInputs = [ base svg xmlpatterns ]; - nativeBuildInputs = [ python ]; - } - ) - {}; - - doc = callPackage - ( - { qtSubmodule, declarative }: - - qtSubmodule { - name = "qtdoc"; - qtInputs = [ declarative ]; - } - ) - {}; - - enginio = callPackage - ( - { qtSubmodule, declarative }: - - qtSubmodule { - name = "qtenginio"; - qtInputs = [ declarative ]; - } - ) - {}; - - graphicaleffects = callPackage - ( - { qtSubmodule, declarative }: - - qtSubmodule { - name = "qtgraphicaleffects"; - qtInputs = [ declarative ]; - } - ) - {}; - - imageformats = callPackage - ( - { qtSubmodule, base }: - - qtSubmodule { - name = "qtimageformats"; - qtInputs = [ base ]; - } - ) - {}; - - location = callPackage - ( - { qtSubmodule, base, multimedia }: - - qtSubmodule { - name = "qtlocation"; - qtInputs = [ base multimedia ]; - } - ) - {}; - - /* macextras = not packaged */ - - multimedia = callPackage - ( - { qtSubmodule, base, declarative, pkgconfig - , alsaLib, gstreamer, gst_plugins_base, libpulseaudio - }: - - qtSubmodule { - name = "qtmultimedia"; - qtInputs = [ base declarative ]; - buildInputs = [ - pkgconfig alsaLib gstreamer gst_plugins_base libpulseaudio - ]; - } - ) - {}; - - quick1 = callPackage - ( - { qtSubmodule, script, svg, webkit, xmlpatterns }: - - qtSubmodule { - name = "qtquick1"; - qtInputs = [ script svg webkit xmlpatterns ]; - } - ) - {}; - - quickcontrols = callPackage - ( - { qtSubmodule, declarative }: - - qtSubmodule { - name = "qtquickcontrols"; - qtInputs = [ declarative ]; - } - ) - {}; - - script = callPackage - ( - { qtSubmodule, base, tools }: - - qtSubmodule { - name = "qtscript"; - qtInputs = [ base tools ]; - patchFlags = "-p2"; # patches originally for monolithic build - patches = [ ./0003-glib-2.32.patch ]; - } - ) - {}; - - sensors = callPackage - ( - { qtSubmodule, base, declarative }: - - qtSubmodule { - name = "qtsensors"; - qtInputs = [ base declarative ]; - } - ) - {}; - - serialport = callPackage - ( - { qtSubmodule, base, substituteAll }: - - qtSubmodule { - name = "qtserialport"; - qtInputs = [ base ]; - patchFlags = "-p2"; # patches originally for monolithic build - patches = [ - (substituteAll { - src = ./0009-dlopen-serialport-udev.patch; - libudev = libudev.out; - }) - ]; - } - ) - {}; - - svg = callPackage - ( - { qtSubmodule, base }: - - qtSubmodule { - name = "qtsvg"; - qtInputs = [ base ]; - } - ) - {}; - - tools = callPackage - ( - { qtSubmodule, activeqt, base, declarative, webkit }: - - qtSubmodule { - name = "qttools"; - qtInputs = [ activeqt base declarative webkit ]; - } - ) - {}; - - translations = callPackage - ( - { qtSubmodule, tools }: - - qtSubmodule { - name = "qttranslations"; - qtInputs = [ tools ]; - } - ) - {}; - - /* wayland = not packaged */ - - /* webchannel = not packaged */ - - /* webengine = not packaged */ - - webkit = callPackage - ( - { qtSubmodule, declarative, location, multimedia, sensors - , fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt - , sqlite, libudev - , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby - , substituteAll - , flashplayerFix ? false - }: - - qtSubmodule { - name = "qtwebkit"; - qtInputs = [ declarative location multimedia sensors ]; - buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite ]; - nativeBuildInputs = [ - bison2 flex gdb gperf perl pkgconfig python ruby - ]; - patchFlags = "-p2"; # patches originally for monolithic build - patches = - optional flashplayerFix - (substituteAll - { - src = ./0002-dlopen-webkit-nsplugin.patch; - gtk = gtk.out; - gdk_pixbuf = gdk_pixbuf.out; - } - ) - ++ optional flashplayerFix - (substituteAll - { - src = ./0007-dlopen-webkit-gtk.patch; - gtk = gtk.out; - } - ) - ++ [ - (substituteAll - { - src = ./0008-dlopen-webkit-udev.patch; - libudev = libudev.out; - } - ) - ]; - } - ) - {}; - - webkit-examples = callPackage - ( - { qtSubmodule, tools, webkit }: - - qtSubmodule { - name = "qtwebkit-examples"; - qtInputs = [ tools webkit ]; - } - ) - {}; - - websockets = callPackage - ( - { qtSubmodule, base, declarative }: - - qtSubmodule { - name = "qtwebsockets"; - qtInputs = [ base declarative ]; - } - ) - {}; - - /* winextras = not packaged */ - - x11extras = callPackage - ( - { qtSubmodule, base }: - - qtSubmodule { - name = "qtx11extras"; - qtInputs = [ base ]; - } - ) - {}; - - xmlpatterns = callPackage - ( - { qtSubmodule, base }: - - qtSubmodule { - name = "qtxmlpatterns"; - qtInputs = [ base ]; - } - ) - {}; + /* qt3d = not packaged */ + /* qtactiveqt = not packaged */ + /* qtandroidextras = not packaged */ + /* qtcanvas3d = not packaged */ + qtconnectivity = callPackage ./qtconnectivity.nix {}; + qtdeclarative = callPackage ./qtdeclarative {}; + qtdoc = callPackage ./qtdoc.nix {}; + qtenginio = callPackage ./qtenginio.nix {}; + qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {}; + qtimageformats = callPackage ./qtimageformats.nix {}; + qtlocation = callPackage ./qtlocation.nix {}; + /* qtmacextras = not packaged */ + qtmultimedia = callPackage ./qtmultimedia.nix { + inherit (pkgs.gst_all_1) gstreamer gst-plugins-base; + }; + qtquick1 = callPackage ./qtquick1 {}; + qtquickcontrols = callPackage ./qtquickcontrols.nix {}; + qtscript = callPackage ./qtscript {}; + qtsensors = callPackage ./qtsensors.nix {}; + qtserialport = callPackage ./qtserialport {}; + qtsvg = callPackage ./qtsvg.nix {}; + qttools = callPackage ./qttools.nix {}; + qttranslations = callPackage ./qttranslations.nix {}; + /* qtwayland = not packaged */ + /* qtwebchannel = not packaged */ + /* qtwebengine = not packaged */ + qtwebkit = callPackage ./qtwebkit {}; + qtwebkit-examples = callPackage ./qtwebkit-examples.nix {}; + qtwebsockets = callPackage ./qtwebsockets.nix {}; + /* qtwinextras = not packaged */ + qtx11extras = callPackage ./qtx11extras.nix {}; + qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; + + env = callPackage ../qt-env.nix {}; + full = env "qt-${qtbase.version}" [ + qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats + qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport + qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras + qtxmlpatterns + ]; + + makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; }; -in self +in makeScope pkgs.newScope addPackages diff --git a/pkgs/development/libraries/qt-5/5.4/fetchsrcs.sh b/pkgs/development/libraries/qt-5/5.4/fetchsrcs.sh new file mode 100755 index 00000000000..0fd5bb8d5fe --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/fetchsrcs.sh @@ -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.qt.io/official_releases/qt/5.4/5.4.2/submodules/" +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 .. diff --git a/pkgs/development/libraries/qt-5/5.4/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.4/make-qt-wrapper.sh new file mode 100644 index 00000000000..d61665455bf --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/make-qt-wrapper.sh @@ -0,0 +1,42 @@ +addQtDependency() { + addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml" + addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" + addToSearchPath XDG_DATA_DIRS "$1/share" +} + +wrapQtProgram() { + local prog="$1" + shift + wrapProgram "$prog" \ + --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ + --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ + --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \ + --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \ + "$@" +} + +makeQtWrapper() { + local old="$1" + local new="$2" + shift + shift + makeWrapper "$old" "$new" \ + --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ + --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ + --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \ + --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \ + "$@" +} + +# cannot use addToSearchPath because these directories may not exist yet +export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$out/lib/qt5/plugins" +export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$out/lib/qt5/imports" +export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$out/lib/qt5/qml" +export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}$out/etc/xdg" +export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}$out/share" + +envHooks+=(addQtDependency) diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.json b/pkgs/development/libraries/qt-5/5.4/manifest.json deleted file mode 100644 index 83dedb41706..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/manifest.json +++ /dev/null @@ -1,301 +0,0 @@ -[ - { - "name": "qtbase-opensource-src-5.4.2", - "store": "/nix/store/60xy2xnsl5kwraqkgh8d950nj1pk3kmi-qtbase-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz", - "sha256": "0x2szpjjvsrpcqw0dd3gsim7b1jv9p716pnllzjbia5mp0hggi4z", - "name": "qtbase-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtenginio-opensource-src-5.4.2", - "store": "/nix/store/4iprnq6sm0b1pnxmxb5krip7kk40xqmr-qtenginio-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtenginio-opensource-src-5.4.2.tar.xz", - "sha256": "082i3fapjw6xs0jkz7x529dn3pb6w1pfli3cjrgvggff86gwlgwn", - "name": "qtenginio-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtserialport-opensource-src-5.4.2", - "store": "/nix/store/l9k1v23ddnhjch5b2p3l28xbqkhz63yl-qtserialport-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz", - "sha256": "1h6p5rb0ldxgzd4md3n79gy0j9blhj736670xqjd9vlvh1743kck", - "name": "qtserialport-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtscript-opensource-src-5.4.2", - "store": "/nix/store/n4ixnakw3fiflyimshkp43h7ijlpiif6-qtscript-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz", - "sha256": "0izsmy0cr8iii78r10ndkidyljxqd2k9g03f5xb9nxacvr2f8hp0", - "name": "qtscript-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtwebchannel-opensource-src-5.4.2", - "store": "/nix/store/qbkqkn4ck0fqbndl9fzp7iaz6c475xq8-qtwebchannel-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebchannel-opensource-src-5.4.2.tar.xz", - "sha256": "0vy1zjbghfa1wirxd8fd2n2n8yryykzr09913qm2nlfbcxdsgqsn", - "name": "qtwebchannel-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtwinextras-opensource-src-5.4.2", - "store": "/nix/store/9kmig3lg8d8s5r1jl3xj5q3jrkp3p8sx-qtwinextras-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtwinextras-opensource-src-5.4.2.tar.xz", - "sha256": "0sgybvr1y2xsddlqc95ninxj3rfmd4gv7a8f7rqcxdynjan5gij0", - "name": "qtwinextras-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtwebsockets-opensource-src-5.4.2", - "store": "/nix/store/zk4s5pgp3mh6xdq6z3svi305vn0pli27-qtwebsockets-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz", - "sha256": "0lv1la8333qnirxmscs42xnnra0xry1gjbhi3bxrf1hrfs2im9j4", - "name": "qtwebsockets-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtmultimedia-opensource-src-5.4.2", - "store": "/nix/store/n8wpy6b8jw1rf51z1qhxbbym7j8rr8ay-qtmultimedia-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz", - "sha256": "0h29cs8ajnjarhjx1aczdnxqwvg6pqs9s8w28hw488s149wqqrnj", - "name": "qtmultimedia-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtgraphicaleffects-opensource-src-5.4.2", - "store": "/nix/store/2q2vk530mf32zzd1v8bpax8iixviw6q5-qtgraphicaleffects-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz", - "sha256": "02p8xm5ajicjam30ry3g1lm2p4nja2q0sls8dzimqrxhw5xlg3xs", - "name": "qtgraphicaleffects-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtxmlpatterns-opensource-src-5.4.2", - "store": "/nix/store/3fqgpa668hb1xmwjw056cw58qzb3r0g4-qtxmlpatterns-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz", - "sha256": "0ar7znqp1i02ha5ngy2kzk3hlgkafjbn2xa8j2k78gzmwsmdhzxa", - "name": "qtxmlpatterns-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qttranslations-opensource-src-5.4.2", - "store": "/nix/store/mg9b5z2nznzxrz501hm06b7l27jjwaca-qttranslations-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz", - "sha256": "0b4l69c16z8gjd4mq75zz3lj2gxarr9wyk0vk60jg1mi62vxvdls", - "name": "qttranslations-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtdeclarative-opensource-src-5.4.2", - "store": "/nix/store/bjmv4fgphx9bggzcwy4lcdas9phbwjsg-qtdeclarative-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz", - "sha256": "1bj1wwms6lpj8s70y8by3j0hjsw6g9v8m6fybx68krzzizbj2c5p", - "name": "qtdeclarative-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtwebkit-opensource-src-5.4.2", - "store": "/nix/store/pfhq8ask8jhzdh2x882d014b10ddywma-qtwebkit-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz", - "sha256": "0vffbpiczag2n2hp5gc0nii8n7vkidr8f8pp8a47px0183hl6hiy", - "name": "qtwebkit-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtquick1-opensource-src-5.4.2", - "store": "/nix/store/n807cxddkvhbzw3ciqs29zc5mw47z2qs-qtquick1-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz", - "sha256": "0178z15a31fw3l6933fwxs7sk0csifpwckydp3rqnn3fg5f2fwvp", - "name": "qtquick1-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtquickcontrols-opensource-src-5.4.2", - "store": "/nix/store/gq8afk8zr2vrrsfmp4caqv02209qk9xb-qtquickcontrols-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz", - "sha256": "137z3c3drxlvkdfc7zgcl0xqmavw0ladzqy0i3bq51h756qdc877", - "name": "qtquickcontrols-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtimageformats-opensource-src-5.4.2", - "store": "/nix/store/cmpx0338z1j0wzk6scfpay5k10023d46-qtimageformats-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz", - "sha256": "1nny6j9pm5ri3n1vwl5lrfrdz0fl81rx127wa49rkg2rjai2aawb", - "name": "qtimageformats-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtdoc-opensource-src-5.4.2", - "store": "/nix/store/jv4wgs6pz9xqmin9m4q4mifr2vfcjn3h-qtdoc-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz", - "sha256": "15lamv6jvd7v33ldpcrazcdksv6qibdcgh4ncbyh774k8avgrlh8", - "name": "qtdoc-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtwayland-opensource-src-5.4.2", - "store": "/nix/store/qa3yi9lyx2dm4wqzb3qzvzba1sgnj74z-qtwayland-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz", - "sha256": "14pmpkfq70plw07igxjaiji4vnjg5kg7izlb0wwym1lisg7bwkg0", - "name": "qtwayland-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtmacextras-opensource-src-5.4.2", - "store": "/nix/store/wdq1z3bzr9n11yln8avx10sgzgyvp8cl-qtmacextras-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.xz", - "sha256": "0h0p3s0rvd3g9rgr4hwcggdbsav2g30vijqwmdxgxd8c00yply80", - "name": "qtmacextras-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtactiveqt-opensource-src-5.4.2", - "store": "/nix/store/0ik7vc3zwdjvrp4fpyqf1zpyqdxvvqvq-qtactiveqt-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtactiveqt-opensource-src-5.4.2.tar.xz", - "sha256": "014kwficqydciwdm1yw88yms81qm8pmi6xfhhfpbc9k85pc6jlla", - "name": "qtactiveqt-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtlocation-opensource-src-5.4.2", - "store": "/nix/store/sa4dawsw2wv45ld3afbz9nfc64qkyx1s-qtlocation-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz", - "sha256": "1v43hl2zzi90vaw11y8dvsksrjn0r2v0br7pw6njl8lqadpg4jnw", - "name": "qtlocation-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtconnectivity-opensource-src-5.4.2", - "store": "/nix/store/v2aiscvf582azyzg696rglway56l7xl2-qtconnectivity-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtconnectivity-opensource-src-5.4.2.tar.xz", - "sha256": "1nj68bzgm3r1gg171kj0acnifzb3jx0m5pf4f81xb7zl4hfxasrs", - "name": "qtconnectivity-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtx11extras-opensource-src-5.4.2", - "store": "/nix/store/nz62qld9h96z5a0b7fg52fsh5d6q0kqw-qtx11extras-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz", - "sha256": "0jgyywjxavfpiz8202g3s0g9izfl185mmak4fs9h80w1i3gn5zzn", - "name": "qtx11extras-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qttools-opensource-src-5.4.2", - "store": "/nix/store/i8n6xrhalg3z4i0min4w79rq9h9hch0x-qttools-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz", - "sha256": "1d5nx01r7wxhdg9f1i9xhsvsbwgaz3yv516s068riy970bhdgwzd", - "name": "qttools-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtsensors-opensource-src-5.4.2", - "store": "/nix/store/0ar28gp8klqxynjnc1r4kj9x7g8cknk2-qtsensors-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz", - "sha256": "1yawvjbdymgw8af7ir9zcin89xxck9dm2l6hnc43lwrky0frcvcf", - "name": "qtsensors-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtwebengine-opensource-src-5.4.2", - "store": "/nix/store/ikr8cc3bn62jlv9afpzhxvqs5qhsc2yc-qtwebengine-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz", - "sha256": "06cyl733prakniqrn8sd807lclk5im2vmysjdcijry2mcyah2ih8", - "name": "qtwebengine-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtsvg-opensource-src-5.4.2", - "store": "/nix/store/0llm31zpiaqig940a8dsp1dk2npxsnjc-qtsvg-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz", - "sha256": "1dsyncp154xvb7d82nmnfjm0ngymnhqmliq58ljwxsjmpjlncakz", - "name": "qtsvg-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qt5-opensource-src-5.4.2", - "store": "/nix/store/0jrx1clg8vqid9b2n9z8f0xbwjm0yynr-qt5-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qt5-opensource-src-5.4.2.tar.xz", - "sha256": "17a0pybr4bpyv9pj7cr5hl4g31biv89bjr8zql723h0b12ql1w44", - "name": "qt5-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtwebkit-examples-opensource-src-5.4.2", - "store": "/nix/store/6pmmi9bjbdxkbw2xkkc1srk5ambnjcxv-qtwebkit-examples-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebkit-examples-opensource-src-5.4.2.tar.xz", - "sha256": "0pm9ik1j09jfb5xflc16449nff2xsfyfms7vxlcdjg4dhcqfmll8", - "name": "qtwebkit-examples-opensource-src-5.4.2.tar.xz" - } - } -, - { - "name": "qtandroidextras-opensource-src-5.4.2", - "store": "/nix/store/grrsklibvplaj5pdwjp2zirxmqnq10hf-qtandroidextras-opensource-src-5.4.2.tar.xz", - "src": { - "url": "official_releases/qt/5.4/5.4.2/submodules/qtandroidextras-opensource-src-5.4.2.tar.xz", - "sha256": "0krfm0wg26x7575p8isswdhrkb0jxyp169grwklil7mfw8yg3xhx", - "name": "qtandroidextras-opensource-src-5.4.2.tar.xz" - } - } -] diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.sh b/pkgs/development/libraries/qt-5/5.4/manifest.sh deleted file mode 100755 index 780269a6417..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/manifest.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -x - -# The extra slash at the end of the URL is necessary to stop wget -# from recursing over the whole server! (No, it's not a bug.) -$(nix-build ../../../../.. --no-out-link -A autonix.manifest) \ - http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/ \ - -A '*.tar.xz' diff --git a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix deleted file mode 100644 index 4012b637e28..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, mkDerivation -, srcs, version -, lndir -, base -}: - -with stdenv.lib; - -args: - -mkDerivation (args // { - - name = "${args.name}-${version}"; - inherit version; - - srcs = args.srcs or [srcs."${args.name}-opensource-src"]; - - qtSubmodule = args.qtSubmodule or true; - dontAddPrefix = args.dontAddPrefix or true; - dontFixLibtool = args.dontFixLibtool or true; - configureScript = args.configureScript or "qmake"; - - postInstall = '' - rm "$out/bin/qmake" "$out/bin/qt.conf" - - cat "$out/nix-support/qt-inputs" | while read file; do - if [[ -h "$out/$file" ]]; then - rm "$out/$file" - fi - done - - cat "$out/nix-support/qt-inputs" | while read file; do - if [[ -d "$out/$file" ]]; then - rmdir --ignore-fail-on-non-empty -p "$out/$file" - fi - done - - rm "$out/nix-support/qt-inputs" - ''; - - propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); - - enableParallelBuilding = - args.enableParallelBuilding or true; # often fails on Hydra, as well as qt4 - - meta = args.meta or { - homepage = http://qt-project.org; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; - }; - -}) diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix deleted file mode 100644 index 2b7052e1ca6..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ /dev/null @@ -1,213 +0,0 @@ -{ stdenv, substituteAll -, srcs, version - -, xorg, libX11, libxcb, libXcursor, libXext, libXrender, libXi -, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon -, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre -, zlib, libjpeg, libpng, libtiff, sqlite, icu - -, coreutils, bison, flex, gdb, gperf, lndir, ruby -, python, perl, pkgconfig - -# optional dependencies -, cups ? null -, mysql ? null, postgresql ? null - -# options -, mesaSupported, mesa, mesa_glu -, buildDocs ? false -, buildExamples ? false -, buildTests ? false -, developerBuild ? false -, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk -, decryptSslTraffic ? false -}: - -with stdenv.lib; - -let system-x86_64 = elem stdenv.system platforms.x86_64; in - -stdenv.mkDerivation { - - name = "qtbase-${version}"; - inherit version; - - srcs = with srcs; [ qt5-opensource-src qtbase-opensource-src ]; - sourceRoot = "qt-everywhere-opensource-src-${version}"; - - postUnpack = '' - mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase - ''; - - prePatch = '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace qtbase/configure --replace /bin/pwd pwd - substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ - --replace /usr/share/X11/locale ${libX11.out}/share/X11/locale \ - --replace /usr/lib/X11/locale ${libX11.out}/share/X11/locale - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf - ''; - - patches = - optional gtkStyle - (substituteAll { - src = ./0001-dlopen-gtkstyle.patch; - # substituteAll ignores env vars starting with capital letter - gconf = GConf.out; - gtk = gtk.out; - libgnomeui = libgnomeui.out; - gnome_vfs = gnome_vfs.out; - }) - ++ [ - (substituteAll { - src = ./0004-dlopen-resolv.patch; - glibc = stdenv.cc.libc.out; - }) - (substituteAll { - src = ./0005-dlopen-gl.patch; - openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; - }) - ./0006-tzdir.patch - (substituteAll { src = ./0010-dlopen-libXcursor.patch; libXcursor = libXcursor.out; }) - (substituteAll { src = ./0011-dlopen-openssl.patch; openssl = openssl.out; }) - (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus.lib; }) - ./0013-xdg_config_dirs.patch - ] ++ optional mesaSupported - (substituteAll { src = ./0014-mkspecs-libgl.patch; mesa_inc = mesa.dev; mesa_lib = mesa.out; }) - ++ (optional decryptSslTraffic ./0100-ssl.patch); - - preConfigure = '' - export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" - export MAKEFLAGS=-j$NIX_BUILD_CORES - - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in" - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake" - sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in" - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" - - export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" - export configureFlags+=" -docdir $out/share/doc/qt5" - ''; - - prefixKey = "-prefix "; - - # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa - # TODO Remove obsolete and useless flags once the build will be totally mastered - configureFlags = '' - -verbose - -confirm-license - -opensource - - -release - -shared - -c++11 - ${optionalString developerBuild "-developer-build"} - -largefile - -accessibility - -rpath - -optimized-qmake - -strip - -reduce-relocations - -system-proxies - -pkg-config - - -gui - -widgets - -opengl desktop - -qml-debug - -nis - -iconv - -icu - -pch - -glib - -xcb - -qpa xcb - -${optionalString (cups == null) "no-"}cups - -${optionalString (!gtkStyle) "no-"}gtkstyle - - -no-eglfs - -no-directfb - -no-linuxfb - -no-kms - - ${optionalString (!system-x86_64) "-no-sse2"} - -no-sse3 - -no-ssse3 - -no-sse4.1 - -no-sse4.2 - -no-avx - -no-avx2 - -no-mips_dsp - -no-mips_dspr2 - - -system-zlib - -system-libpng - -system-libjpeg - -system-xcb - -system-xkbcommon - -openssl-linked - -dbus-linked - - -system-sqlite - -${if mysql != null then "plugin" else "no"}-sql-mysql - -${if postgresql != null then "plugin" else "no"}-sql-psql - - -make libs - -make tools - -${optionalString (buildExamples == false) "no"}make examples - -${optionalString (buildTests == false) "no"}make tests - ''; - - # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag - # if dependency paths contain the string "pq", which can occur in the hash. - # To prevent these failures, we need to override PostgreSQL detection. - PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; - - propagatedBuildInputs = [ - xorg.libXcomposite libX11 libxcb libXext libXrender libXi - fontconfig freetype openssl dbus glib udev libxml2 libxslt pcre - zlib libjpeg libpng libtiff sqlite icu - xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon - ] - # Qt doesn't directly need GLU (just GL), but many apps use, it's small and - # doesn't remain a runtime-dep if not used - ++ optionals mesaSupported [ mesa mesa_glu ] - ++ optional (cups != null) cups - ++ optional (mysql != null) mysql.lib - ++ optional (postgresql != null) postgresql - ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; - - buildInputs = - [ bison flex gperf ruby ] - ++ optional developerBuild gdb; - - nativeBuildInputs = [ python perl pkgconfig ]; - - # freetype-2.5.4 changed signedness of some struct fields - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; - - postInstall = - '' - ${optionalString buildDocs '' - make docs && make install_docs - ''} - - # Don't retain build-time dependencies like gdb and ruby. - sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri - ''; - - inherit lndir; - setupHook = ./setup-hook.sh; - - enableParallelBuilding = true; # often fails on Hydra, as well as qt4 - - meta = { - homepage = http://qt-project.org; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/compose-search-path.patch new file mode 100644 index 00000000000..08d12087f08 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/compose-search-path.patch @@ -0,0 +1,16 @@ +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +@@ -68,10 +68,7 @@ void TableGenerator::initPossibleLocatio + // the QTCOMPOSE environment variable + if (qEnvironmentVariableIsSet("QTCOMPOSE")) + m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); +- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); ++ m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale")); + m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); + m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); + } diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/decrypt-ssl-traffic.patch new file mode 100644 index 00000000000..10e7e01a07f --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/decrypt-ssl-traffic.patch @@ -0,0 +1,13 @@ +Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_openssl.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp ++++ qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_openssl.cpp +@@ -47,7 +47,7 @@ + ****************************************************************************/ + + //#define QSSLSOCKET_DEBUG +-//#define QT_DECRYPT_SSL_TRAFFIC ++#define QT_DECRYPT_SSL_TRAFFIC + + #include "qssl_p.h" + #include "qsslsocket_openssl_p.h" diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix new file mode 100644 index 00000000000..36bd3822bf7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix @@ -0,0 +1,224 @@ +{ stdenv, lib, fetchurl, copyPathsToStore, makeWrapper +, srcs + +, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi +, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon +, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre +, zlib, libjpeg, libpng, libtiff, sqlite, icu + +, coreutils, bison, flex, gdb, gperf, lndir, ruby +, python, perl, pkgconfig + +# optional dependencies +, cups ? null +, mysql ? null, postgresql ? null + +# options +, mesaSupported, mesa, mesa_glu +, buildDocs ? false +, buildExamples ? false +, buildTests ? false +, developerBuild ? false +, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk +, decryptSslTraffic ? false +}: + +let + inherit (srcs.qt5) version; + system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; +in + +stdenv.mkDerivation { + + name = "qtbase-${version}"; + inherit version; + + srcs = with srcs; [ qt5.src qtbase.src ]; + + sourceRoot = "qt-everywhere-opensource-src-${version}"; + + postUnpack = '' + mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase + ''; + + patches = + copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ lib.optional gtkStyle ./dlopen-gtkstyle.patch + ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch + ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; + + postPatch = + '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace qtbase/configure --replace /bin/pwd pwd + substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf + + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in" + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake" + sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in" + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" + + substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \ + --replace "@glibc@" "${stdenv.cc.libc}" + substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \ + --replace "@glibc@" "${stdenv.cc.libc}" + + substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \ + --replace "@libXcursor@" "${libXcursor}" + + substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \ + --replace "@openssl@" "${openssl}" + + substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \ + --replace "@dbus_libs@" "${dbus}" + + substituteInPlace \ + qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ + --replace "@libX11@" "${libX11}" + '' + + lib.optionalString gtkStyle '' + substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}" + substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \ + --replace "@gtk@" "${gtk}" \ + --replace "@gnome_vfs@" "${gnome_vfs}" \ + --replace "@libgnomeui@" "${libgnomeui}" \ + --replace "@gconf@" "${GConf}" + '' + + lib.optionalString mesaSupported '' + substituteInPlace \ + qtbase/src/plugins/platforms/xcb/qglxintegration.cpp \ + --replace "@mesa@" "${mesa}" + substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}" + ''; + + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH" + export MAKEFLAGS=-j$NIX_BUILD_CORES + + export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" + export configureFlags+=" -docdir $out/share/doc/qt5" + ''; + + prefixKey = "-prefix "; + + # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa + # TODO Remove obsolete and useless flags once the build will be totally mastered + configureFlags = '' + -verbose + -confirm-license + -opensource + + -release + -shared + -c++11 + ${lib.optionalString developerBuild "-developer-build"} + -largefile + -accessibility + -rpath + -optimized-qmake + -strip + -reduce-relocations + -system-proxies + -pkg-config + + -gui + -widgets + -opengl desktop + -qml-debug + -nis + -iconv + -icu + -pch + -glib + -xcb + -qpa xcb + -${lib.optionalString (cups == null) "no-"}cups + -${lib.optionalString (!gtkStyle) "no-"}gtkstyle + + -no-eglfs + -no-directfb + -no-linuxfb + -no-kms + + ${lib.optionalString (!system-x86_64) "-no-sse2"} + -no-sse3 + -no-ssse3 + -no-sse4.1 + -no-sse4.2 + -no-avx + -no-avx2 + -no-mips_dsp + -no-mips_dspr2 + + -system-zlib + -system-libpng + -system-libjpeg + -system-xcb + -system-xkbcommon + -openssl-linked + -dbus-linked + + -system-sqlite + -${if mysql != null then "plugin" else "no"}-sql-mysql + -${if postgresql != null then "plugin" else "no"}-sql-psql + + -make libs + -make tools + -${lib.optionalString (buildExamples == false) "no"}make examples + -${lib.optionalString (buildTests == false) "no"}make tests + ''; + + # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag + # if dependency paths contain the string "pq", which can occur in the hash. + # To prevent these failures, we need to override PostgreSQL detection. + PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; + + propagatedBuildInputs = [ + xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre + zlib libjpeg libpng libtiff sqlite icu + xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon + ] + # Qt doesn't directly need GLU (just GL), but many apps use, it's small and + # doesn't remain a runtime-dep if not used + ++ lib.optionals mesaSupported [ mesa mesa_glu ] + ++ lib.optional (cups != null) cups + ++ lib.optional (mysql != null) mysql.lib + ++ lib.optional (postgresql != null) postgresql + ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; + + buildInputs = + [ bison flex gperf ruby ] + ++ lib.optional developerBuild gdb; + + nativeBuildInputs = [ python perl pkgconfig ]; + + propagatedNativeBuildInputs = [ makeWrapper ]; + + # freetype-2.5.4 changed signedness of some struct fields + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + + postInstall = + '' + # Don't retain build-time dependencies like gdb and ruby. + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri + '' + + lib.optionalString buildDocs '' + make docs && make install_docs + ''; + + inherit lndir; + setupHook = ./setup-hook.sh; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = http://qt-project.org; + description = "A cross-platform application framework for C++"; + license = "GPL/LGPL"; + maintainers = with maintainers; [ bbenoist qknight ttuegel ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-dbus.patch new file mode 100644 index 00000000000..05e98d8be71 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-dbus.patch @@ -0,0 +1,13 @@ +Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/dbus/qdbus_symbols.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/dbus/qdbus_symbols.cpp ++++ qt-everywhere-opensource-src-5.4.2/qtbase/src/dbus/qdbus_symbols.cpp +@@ -88,7 +88,7 @@ bool qdbus_loadLibDBus() + #ifdef Q_OS_WIN + QLatin1String("dbus-1"), + #endif +- QLatin1String("libdbus-1") ++ QLatin1String("@dbus_libs@/lib/libdbus-1") + }; + + lib->unload(); diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch new file mode 100644 index 00000000000..d6e08cd2410 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch @@ -0,0 +1,17 @@ +Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp ++++ qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp +@@ -560,7 +560,12 @@ void (*QGLXContext::getProcAddress(const + { + extern const QString qt_gl_library_name(); + // QLibrary lib(qt_gl_library_name()); ++ // Check system library paths first + QLibrary lib(QLatin1String("GL")); ++ if (!lib.load()) { ++ // Fallback to Mesa driver ++ lib.setFileName(QLatin1String("@mesa@/lib/libGL")); ++ } + glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + } + } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gtkstyle.patch index a4211378b90..c2be7377949 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gtkstyle.patch @@ -1,17 +1,7 @@ -From 5334f7d5d3e7be31ea25c3553dfb60f283a14669 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:21:58 -0600 -Subject: [PATCH 01/11] dlopen-gtkstyle - ---- - qtbase/src/widgets/styles/qgtk2painter.cpp | 2 +- - qtbase/src/widgets/styles/qgtkstyle_p.cpp | 12 ++++++------ - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/qtbase/src/widgets/styles/qgtk2painter.cpp b/qtbase/src/widgets/styles/qgtk2painter.cpp -index 489d456..c38e986 100644 ---- a/qtbase/src/widgets/styles/qgtk2painter.cpp -+++ b/qtbase/src/widgets/styles/qgtk2painter.cpp +Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtk2painter.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/widgets/styles/qgtk2painter.cpp ++++ qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtk2painter.cpp @@ -96,7 +96,7 @@ static void initGtk() static bool initialized = false; if (!initialized) { @@ -21,11 +11,11 @@ index 489d456..c38e986 100644 QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new"); QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable"); -diff --git a/qtbase/src/widgets/styles/qgtkstyle_p.cpp b/qtbase/src/widgets/styles/qgtkstyle_p.cpp -index 0e119a1..ad6caa1 100644 ---- a/qtbase/src/widgets/styles/qgtkstyle_p.cpp -+++ b/qtbase/src/widgets/styles/qgtkstyle_p.cpp -@@ -327,7 +327,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus(GtkWidget *widget, bool focus) +Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtkstyle_p.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/widgets/styles/qgtkstyle_p.cpp ++++ qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtkstyle_p.cpp +@@ -326,7 +326,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus void QGtkStylePrivate::resolveGtk() const { // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 @@ -34,7 +24,7 @@ index 0e119a1..ad6caa1 100644 gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); -@@ -425,8 +425,8 @@ void QGtkStylePrivate::resolveGtk() const +@@ -424,8 +424,8 @@ void QGtkStylePrivate::resolveGtk() cons pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); @@ -45,7 +35,7 @@ index 0e119a1..ad6caa1 100644 } /* \internal -@@ -594,9 +594,9 @@ void QGtkStylePrivate::cleanupGtkWidgets() +@@ -593,9 +593,9 @@ void QGtkStylePrivate::cleanupGtkWidgets static bool resolveGConf() { if (!QGtkStylePrivate::gconf_client_get_default) { @@ -58,6 +48,3 @@ index 0e119a1..ad6caa1 100644 } return (QGtkStylePrivate::gconf_client_get_default !=0); } --- -2.5.2 - diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-libXcursor.patch new file mode 100644 index 00000000000..608c68b6d5b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-libXcursor.patch @@ -0,0 +1,17 @@ +Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -297,10 +297,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c + #ifdef XCB_USE_XLIB + static bool function_ptrs_not_initialized = true; + if (function_ptrs_not_initialized) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); ++ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); + bool xcursorFound = xcursorLib.load(); + if (!xcursorFound) { // try without the version number +- xcursorLib.setFileName(QLatin1String("Xcursor")); ++ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { diff --git a/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-openssl.patch index a79f0f36389..b648a58b570 100644 --- a/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-openssl.patch @@ -1,8 +1,8 @@ -diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -index c1fea93..bc1c0f0 100644 ---- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -611,8 +611,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl() +Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -611,8 +611,8 @@ static QPair<QLibrary*, QLibrary*> loadO #endif #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> @@ -13,7 +13,7 @@ index c1fea93..bc1c0f0 100644 if (libcrypto->load() && libssl->load()) { // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found return pair; -@@ -629,8 +629,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl() +@@ -629,8 +629,8 @@ static QPair<QLibrary*, QLibrary*> loadO // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third // attempt, _after_ <bundle>/Contents/Frameworks has been searched. // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch new file mode 100644 index 00000000000..a79c806462f --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch @@ -0,0 +1,26 @@ +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qdnslookup_unix.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp +@@ -79,7 +79,7 @@ static void resolveLibrary() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc/lib/resolv")); + if (!lib.load()) + return; + } +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qhostinfo_unix.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp +@@ -95,7 +95,7 @@ static void resolveLibrary() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + } diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch new file mode 100644 index 00000000000..10115e8144a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch @@ -0,0 +1,15 @@ +Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/mkspecs/common/linux.conf ++++ qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf +@@ -12,8 +12,8 @@ QMAKE_INCDIR = + QMAKE_LIBDIR = + QMAKE_INCDIR_X11 = + QMAKE_LIBDIR_X11 = +-QMAKE_INCDIR_OPENGL = +-QMAKE_LIBDIR_OPENGL = ++QMAKE_INCDIR_OPENGL = @mesa@/include ++QMAKE_LIBDIR_OPENGL = @mesa@/lib + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL + QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/nix-profiles-library-paths.patch index 8eaf2f4ffac..824d2ea0817 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/nix-profiles-library-paths.patch @@ -1,17 +1,8 @@ -From 2da5e660c4b470444e756f2ec88cb520a124bc99 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sat, 17 Oct 2015 09:20:35 -0500 -Subject: [PATCH] nix profiles library paths - ---- - qtbase/src/corelib/kernel/qcoreapplication.cpp | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/qtbase/src/corelib/kernel/qcoreapplication.cpp b/qtbase/src/corelib/kernel/qcoreapplication.cpp -index ecafe91..96e3eb5 100644 ---- a/qtbase/src/corelib/kernel/qcoreapplication.cpp -+++ b/qtbase/src/corelib/kernel/qcoreapplication.cpp -@@ -2496,6 +2496,21 @@ QStringList QCoreApplication::libraryPaths() +Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/kernel/qcoreapplication.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp ++++ qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/kernel/qcoreapplication.cpp +@@ -2442,6 +2442,21 @@ QStringList QCoreApplication::libraryPat } } } @@ -33,6 +24,3 @@ index ecafe91..96e3eb5 100644 } return *(coreappdata()->app_libpaths); } --- -2.5.2 - diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/series b/pkgs/development/libraries/qt-5/5.4/qtbase/series new file mode 100644 index 00000000000..3cfa50e85b7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/series @@ -0,0 +1,8 @@ +dlopen-resolv.patch +tzdir.patch +dlopen-libXcursor.patch +dlopen-openssl.patch +dlopen-dbus.patch +xdg-config-dirs.patch +nix-profiles-library-paths.patch +compose-search-path.patch diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh new file mode 100644 index 00000000000..b86b6df28ac --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh @@ -0,0 +1,100 @@ +if [[ -z "$QMAKE" ]]; then + +linkDependencyDir() { + @lndir@/bin/lndir -silent "$1/$2" "$qtOut/$2" + if [[ -n "$NIX_QT_SUBMODULE" ]]; then + find "$1/$2" -printf "$2/%P\n" >> "$out/nix-support/qt-inputs" + fi +} + +addQtModule() { + if [[ -d "$1/mkspecs" ]]; then + # $1 is a Qt module + linkDependencyDir "$1" mkspecs + + for dir in bin include lib share; do + if [[ -d "$1/$dir" ]]; then + linkDependencyDir "$1" "$dir" + fi + done + fi +} + +propagateRuntimeDeps() { + local propagated + for dir in "etc/xdg" "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports" "share"; do + if [[ -d "$1/$dir" ]]; then + propagated= + for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + break + fi + done + if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs $1" + fi + break + fi + done +} + +rmQtModules() { + cat "$out/nix-support/qt-inputs" | while read file; do + if [[ -h "$out/$file" ]]; then + rm "$out/$file" + fi + done + + cat "$out/nix-support/qt-inputs" | while read file; do + if [[ -d "$out/$file" ]]; then + rmdir --ignore-fail-on-non-empty -p "$out/$file" + fi + done + + rm "$out/nix-support/qt-inputs" +} + +rmQMake() { + rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf" +} + +setQMakePath() { + export PATH="$qtOut/bin${PATH:+:}$PATH" +} + +qtOut="" +if [[ -z "$NIX_QT_SUBMODULE" ]]; then + qtOut=`mktemp -d` +else + qtOut=$out +fi + +mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share" + +cp "@out@/bin/qmake" "$qtOut/bin" +cat >"$qtOut/bin/qt.conf" <<EOF +[Paths] +Prefix = $qtOut +Plugins = lib/qt5/plugins +Imports = lib/qt5/imports +Qml2Imports = lib/qt5/qml +Documentation = share/doc/qt5 +EOF + +export QMAKE="$qtOut/bin/qmake" + +envHooks+=(addQtModule propagateRuntimeDeps) +preConfigurePhases+=(setQMakePath) + +if [[ -n "$NIX_QT_SUBMODULE" ]]; then + preFixupPhases+=(rmQtModules) + postPhases+=(rmQMake) +fi + +fi + +if [[ -z "$NIX_QT_PIC" ]]; then + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC" + export NIX_QT_PIC=1 +fi diff --git a/pkgs/development/libraries/qt-5/5.4/0006-tzdir.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/tzdir.patch index d5a74b25fb3..f62b25ef445 100644 --- a/pkgs/development/libraries/qt-5/5.4/0006-tzdir.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/tzdir.patch @@ -1,17 +1,8 @@ -From 775fd74351faaabd45f6751618b28e2b05812d05 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:23:22 -0600 -Subject: [PATCH] tzdir - ---- - qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -index b4ea91e..a56a245 100644 ---- a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -68,7 +68,10 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; +Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -61,7 +61,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -23,7 +14,7 @@ index b4ea91e..a56a245 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -559,12 +562,18 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) +@@ -552,12 +555,18 @@ void QTzTimeZonePrivate::init(const QByt if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -47,6 +38,3 @@ index b4ea91e..a56a245 100644 } } --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.4/0013-xdg_config_dirs.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/xdg-config-dirs.patch index 63066658f0f..dbf5eac52e6 100644 --- a/pkgs/development/libraries/qt-5/5.4/0013-xdg_config_dirs.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/xdg-config-dirs.patch @@ -1,8 +1,8 @@ -diff --git a/qsettings.cpp b/qsettings.cpp -index 35b3ed4..210dfeb 100644 ---- a/qsettings.cpp -+++ b/qtbase/src/corelib/io/qsettings.cpp -@@ -1174,6 +1174,24 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format, +Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/corelib/io/qsettings.cpp ++++ qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings.cpp +@@ -1128,6 +1128,24 @@ QConfFileSettingsPrivate::QConfFileSetti if (!application.isEmpty()) confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false)); @@ -27,11 +27,11 @@ index 35b3ed4..210dfeb 100644 #else QString confName = getPath(format, QSettings::UserScope) + org; if (!application.isEmpty()) -diff --git a/qsettings_p.h b/qsettings_p.h -index a28b583..b2a240d 100644 ---- a/qsettings_p.h -+++ b/qtbase/src/corelib/io/qsettings_p.h -@@ -244,7 +244,7 @@ public: +Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings_p.h +=================================================================== +--- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/corelib/io/qsettings_p.h ++++ qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings_p.h +@@ -240,7 +240,7 @@ public: F_Organization = 0x1, F_User = 0x0, F_System = 0x2, diff --git a/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix new file mode 100644 index 00000000000..95cd6fea79b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qtconnectivity"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/0001-nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/0001-nix-profiles-import-paths.patch new file mode 100644 index 00000000000..8e86f97a947 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/0001-nix-profiles-import-paths.patch @@ -0,0 +1,37 @@ +From 3f6fa74067aacd0e595e45b4ef7ce754514cb205 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sat, 17 Oct 2015 09:28:18 -0500 +Subject: [PATCH] nix profiles import paths + +--- + src/qml/qml/qqmlimport.cpp | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp +index 5a54609..f33c2f9 100644 +--- a/src/qml/qml/qqmlimport.cpp ++++ b/src/qml/qml/qqmlimport.cpp +@@ -1549,6 +1549,20 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + addImportPath(installImportsPath); + ++ // Add import paths derived from NIX_PROFILES. ++ const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); ++ if (!nixProfilesEnv.isEmpty()) { ++ QLatin1Char pathSep(' '); ++ QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/lib/qt5/qml"); ++ QString canonicalPath = QDir(*it).canonicalPath(); ++ if (!canonicalPath.isEmpty()) { ++ addImportPath(canonicalPath); ++ } ++ } ++ } ++ + // env import paths + QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); + if (!envImportPath.isEmpty()) { +-- +2.5.2 + diff --git a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix new file mode 100644 index 00000000000..9181c37b225 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix @@ -0,0 +1,8 @@ +{ qtSubmodule, python, qtbase, qtsvg, qtxmlpatterns }: + +qtSubmodule { + name = "qtdeclarative"; + patches = [ ./0001-nix-profiles-import-paths.patch ]; + qtInputs = [ qtbase qtsvg qtxmlpatterns ]; + nativeBuildInputs = [ python ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtdoc.nix b/pkgs/development/libraries/qt-5/5.4/qtdoc.nix new file mode 100644 index 00000000000..578ea6ba0b2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtdoc.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtdeclarative }: + +qtSubmodule { + name = "qtdoc"; + qtInputs = [ qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtenginio.nix b/pkgs/development/libraries/qt-5/5.4/qtenginio.nix new file mode 100644 index 00000000000..b860a73ef89 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtenginio.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtdeclarative }: + +qtSubmodule { + name = "qtenginio"; + qtInputs = [ qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.4/qtgraphicaleffects.nix new file mode 100644 index 00000000000..3273f12eb83 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtgraphicaleffects.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtdeclarative }: + +qtSubmodule { + name = "qtgraphicaleffects"; + qtInputs = [ qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.4/qtimageformats.nix new file mode 100644 index 00000000000..03d0fffbe80 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtimageformats.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtimageformats"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtlocation.nix b/pkgs/development/libraries/qt-5/5.4/qtlocation.nix new file mode 100644 index 00000000000..1e134057c4b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtlocation.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase, qtmultimedia }: + +qtSubmodule { + name = "qtlocation"; + qtInputs = [ qtbase qtmultimedia ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix new file mode 100644 index 00000000000..b6b4d8ea0cf --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix @@ -0,0 +1,12 @@ +{ qtSubmodule, qtbase, qtdeclarative, pkgconfig +, alsaLib, gstreamer, gst-plugins-base, libpulseaudio +}: + +qtSubmodule { + name = "qtmultimedia"; + qtInputs = [ qtbase qtdeclarative ]; + buildInputs = [ + pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio + ]; + configureFlags = "GST_VERSION=1.0"; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtquick1/0001-nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.4/qtquick1/0001-nix-profiles-import-paths.patch new file mode 100644 index 00000000000..63b141f6ce5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtquick1/0001-nix-profiles-import-paths.patch @@ -0,0 +1,37 @@ +From bbc706b3fcb90ca3b2b51d5e3434145572152711 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sat, 17 Oct 2015 09:29:51 -0500 +Subject: [PATCH] nix profiles import paths + +--- + src/declarative/qml/qdeclarativeimport.cpp | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp +index 9404834..d185ed5 100644 +--- a/src/declarative/qml/qdeclarativeimport.cpp ++++ b/src/declarative/qml/qdeclarativeimport.cpp +@@ -725,6 +725,20 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) + + addImportPath(installImportsPath); + ++ // Add import paths derived from NIX_PROFILES. ++ const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); ++ if (!nixProfilesEnv.isEmpty()) { ++ QLatin1Char pathSep(' '); ++ QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/lib/qt5/imports"); ++ QString canonicalPath = QDir(*it).canonicalPath(); ++ if (!canonicalPath.isEmpty()) { ++ addImportPath(canonicalPath); ++ } ++ } ++ } ++ + // env import paths + QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); + if (!envImportPath.isEmpty()) { +-- +2.5.2 + diff --git a/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix new file mode 100644 index 00000000000..d1c7bb389a4 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix @@ -0,0 +1,7 @@ +{ qtSubmodule, qtscript, qtsvg, qtwebkit, qtxmlpatterns }: + +qtSubmodule { + name = "qtquick1"; + patches = [ ./0001-nix-profiles-import-paths.patch ]; + qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.4/qtquickcontrols.nix new file mode 100644 index 00000000000..93a864621b8 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtquickcontrols.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtdeclarative }: + +qtSubmodule { + name = "qtquickcontrols"; + qtInputs = [ qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.4/qtscript/0001-glib-2.32.patch new file mode 100644 index 00000000000..887e107b6c1 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtscript/0001-glib-2.32.patch @@ -0,0 +1,25 @@ +From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sun, 23 Aug 2015 09:13:34 -0500 +Subject: [PATCH] glib-2.32 + +--- + src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +index 1f6d25e..087c3fb 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +@@ -81,7 +81,7 @@ + #include <pthread.h> + #elif PLATFORM(GTK) + #include <wtf/gtk/GOwnPtr.h> +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix new file mode 100644 index 00000000000..127766e2ebd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix @@ -0,0 +1,7 @@ +{ qtSubmodule, qtbase, qttools }: + +qtSubmodule { + name = "qtscript"; + qtInputs = [ qtbase qttools ]; + patches = [ ./0001-glib-2.32.patch ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtsensors.nix b/pkgs/development/libraries/qt-5/5.4/qtsensors.nix new file mode 100644 index 00000000000..61e64dc47e4 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtsensors.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qtsensors"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/0009-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.4/qtserialport/0001-dlopen-serialport-udev.patch index bb304392af4..3a813dc8007 100644 --- a/pkgs/development/libraries/qt-5/5.4/0009-dlopen-serialport-udev.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtserialport/0001-dlopen-serialport-udev.patch @@ -1,17 +1,17 @@ -From 17c7257e54c00ea2121f2cf95fb2be5e5db6b4ad Mon Sep 17 00:00:00 2001 +From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:31:03 -0600 -Subject: [PATCH] dlopen-serialport-udev +Date: Sun, 23 Aug 2015 09:16:02 -0500 +Subject: [PATCH] dlopen serialport udev --- - qtserialport/src/serialport/qtudev_p.h | 4 ++-- + src/serialport/qtudev_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/qtserialport/src/serialport/qtudev_p.h b/qtserialport/src/serialport/qtudev_p.h -index 09940ab..45460f9 100644 ---- a/qtserialport/src/serialport/qtudev_p.h -+++ b/qtserialport/src/serialport/qtudev_p.h -@@ -119,9 +119,9 @@ inline void *resolveSymbol(QLibrary *udevLibrary, const char *symbolName) +diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h +index 6f2cabd..81b9849 100644 +--- a/src/serialport/qtudev_p.h ++++ b/src/serialport/qtudev_p.h +@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN inline bool resolveSymbols(QLibrary *udevLibrary) { if (!udevLibrary->isLoaded()) { @@ -24,5 +24,5 @@ index 09940ab..45460f9 100644 qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); return false; -- -2.1.3 +2.5.0 diff --git a/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix new file mode 100644 index 00000000000..072825dfe9b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix @@ -0,0 +1,13 @@ +{ qtSubmodule, qtbase, substituteAll, libudev }: + +qtSubmodule { + name = "qtserialport"; + qtInputs = [ qtbase ]; + + patches = [ + (substituteAll { + src = ./0001-dlopen-serialport-udev.patch; + libudev = libudev.out; + }) + ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtsvg.nix b/pkgs/development/libraries/qt-5/5.4/qtsvg.nix new file mode 100644 index 00000000000..b9ccac7cf93 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtsvg.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtsvg"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qttools.nix b/pkgs/development/libraries/qt-5/5.4/qttools.nix new file mode 100644 index 00000000000..65edc450812 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qttools.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qttools"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qttranslations.nix b/pkgs/development/libraries/qt-5/5.4/qttranslations.nix new file mode 100644 index 00000000000..50fc8cf6826 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qttranslations.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qttools }: + +qtSubmodule { + name = "qttranslations"; + qtInputs = [ qttools ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit-examples.nix b/pkgs/development/libraries/qt-5/5.4/qtwebkit-examples.nix new file mode 100644 index 00000000000..64f85c42d19 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtwebkit-examples.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qttools, qtwebkit }: + +qtSubmodule { + name = "qtwebkit-examples"; + qtInputs = [ qttools qtwebkit ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/0002-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0001-dlopen-webkit-nsplugin.patch index 0752cdcf479..0eeacce1bc0 100644 --- a/pkgs/development/libraries/qt-5/5.4/0002-dlopen-webkit-nsplugin.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0001-dlopen-webkit-nsplugin.patch @@ -1,19 +1,19 @@ -From 8c30f72dbe11752e8ed25f292c6e5695d7733f72 Mon Sep 17 00:00:00 2001 +From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:22:23 -0600 -Subject: [PATCH] dlopen-webkit-nsplugin +Date: Sun, 23 Aug 2015 09:18:54 -0500 +Subject: [PATCH 1/3] dlopen webkit nsplugin --- - qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- - qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- - .../WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- + Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- + Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- + Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -index 679480b..2c373cc 100644 ---- a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -@@ -132,7 +132,7 @@ static void initializeGtk(QLibrary* module = 0) +diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +index a923d49..2731d05 100644 +--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0) } } @@ -22,10 +22,10 @@ index 679480b..2c373cc 100644 if (library.load()) { typedef void *(*gtk_init_check_ptr)(int*, char***); gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp index de06a2f..363bde5 100644 ---- a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +--- a/Source/WebCore/plugins/qt/PluginViewQt.cpp ++++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp @@ -697,7 +697,7 @@ static Display *getPluginDisplay() // support gdk based plugins (like flash) that use a different X connection. // The code below has the same effect as this one: @@ -35,10 +35,10 @@ index de06a2f..363bde5 100644 if (!library.load()) return 0; -diff --git a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp index d734ff6..62a2197 100644 ---- a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -+++ b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +--- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ++++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp @@ -64,7 +64,7 @@ static Display* getPluginDisplay() // The code below has the same effect as this one: // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); @@ -49,5 +49,5 @@ index d734ff6..62a2197 100644 return 0; -- -2.1.3 +2.5.0 diff --git a/pkgs/development/libraries/qt-5/5.4/0007-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0002-dlopen-webkit-gtk.patch index 9582b714c90..bb5d1f74364 100644 --- a/pkgs/development/libraries/qt-5/5.4/0007-dlopen-webkit-gtk.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0002-dlopen-webkit-gtk.patch @@ -1,16 +1,16 @@ -From 089db8835c80bf2b7dd91a97a5c6eb26636b6ab9 Mon Sep 17 00:00:00 2001 +From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:26:39 -0600 -Subject: [PATCH] dlopen-webkit-gtk +Date: Sun, 23 Aug 2015 09:19:16 -0500 +Subject: [PATCH 2/3] dlopen webkit gtk --- - qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- + Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp index 8de6521..0b25748 100644 ---- a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -+++ b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +--- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp ++++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp @@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr static bool initializeGtk() @@ -21,5 +21,5 @@ index 8de6521..0b25748 100644 return false; typedef void* (*gtk_init_ptr)(void*, void*); -- -2.1.3 +2.5.0 diff --git a/pkgs/development/libraries/qt-5/5.4/0008-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch index fd226708a91..1c360cd81aa 100644 --- a/pkgs/development/libraries/qt-5/5.4/0008-dlopen-webkit-udev.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch @@ -1,16 +1,16 @@ -From 25d2922cce383fcaa4c138e0cc6c8d92328eeacb Mon Sep 17 00:00:00 2001 +From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:30:41 -0600 -Subject: [PATCH] dlopen-webkit-udev +Date: Sun, 23 Aug 2015 09:19:29 -0500 +Subject: [PATCH 3/3] dlopen webkit udev --- - qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- + Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp +diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp index 60ff317..da8ac69 100644 ---- a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp -+++ b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp +--- a/Source/WebCore/platform/qt/GamepadsQt.cpp ++++ b/Source/WebCore/platform/qt/GamepadsQt.cpp @@ -111,12 +111,12 @@ private: bool load() { @@ -27,5 +27,5 @@ index 60ff317..da8ac69 100644 return resolveMethods(); } -- -2.1.3 +2.5.0 diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix new file mode 100644 index 00000000000..2620dcdf2d8 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix @@ -0,0 +1,34 @@ +{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtmultimedia, qtsensors +, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, sqlite, libudev +, bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby +, substituteAll +, flashplayerFix ? false +}: + +with stdenv.lib; + +qtSubmodule { + name = "qtwebkit"; + qtInputs = [ qtdeclarative qtlocation qtmultimedia qtsensors ]; + buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite ]; + nativeBuildInputs = [ + bison2 flex gdb gperf perl pkgconfig python ruby + ]; + patches = + let dlopen-webkit-nsplugin = substituteAll { + src = ./0001-dlopen-webkit-nsplugin.patch; + gtk = gtk.out; + gdk_pixbuf = gdk_pixbuf.out; + }; + dlopen-webkit-gtk = substituteAll { + src = ./0002-dlopen-webkit-gtk.patch; + gtk = gtk.out; + }; + dlopen-webkit-udev = substituteAll { + src = ./0003-dlopen-webkit-udev.patch; + udev = libudev.out; + }; + in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] + ++ [ dlopen-webkit-udev ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix new file mode 100644 index 00000000000..fbdfbbcf0db --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qtwebsockets"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix new file mode 100644 index 00000000000..a765161e2d7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtx11extras"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix new file mode 100644 index 00000000000..9a8ddbba2bd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtxmlpatterns"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh deleted file mode 100644 index 3bc4890f3bb..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh +++ /dev/null @@ -1,77 +0,0 @@ -addQtModule() { - if [[ -d "$1/mkspecs" ]]; then - - @lndir@/bin/lndir -silent "$1/mkspecs" "$qtOut/mkspecs" - if [[ -n $qtSubmodule ]]; then - find "$1/mkspecs" -printf 'mkspecs/%P\n' >> "$qtOut/nix-support/qt-inputs" - fi - - if [[ -d "$1/bin" ]]; then - @lndir@/bin/lndir -silent "$1/bin" "$qtOut/bin" - if [[ -n $qtSubmodule ]]; then - find "$1/bin" -printf 'bin/%P\n' >> "$qtOut/nix-support/qt-inputs" - fi - fi - - if [[ -d "$1/include" ]]; then - @lndir@/bin/lndir -silent "$1/include" "$qtOut/include" - if [[ -n $qtSubmodule ]]; then - find "$1/include" -printf 'include/%P\n' >> "$qtOut/nix-support/qt-inputs" - fi - fi - - if [[ -d "$1/lib" ]]; then - @lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib" - if [[ -n $qtSubmodule ]]; then - find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs" - fi - - if [[ -d "$1/lib/qt5/plugins" ]]; then - QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$1/lib/qt5/plugins"; - fi - - if [[ -d "$1/lib/qt5/imports" ]]; then - QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$1/lib/qt5/imports"; - fi - - if [[ -d "$1/lib/qt5/qml" ]]; then - QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$1/lib/qt5/qml"; - fi - fi - - if [[ -d "$1/share" ]]; then - @lndir@/bin/lndir -silent "$1/share" "$qtOut/share" - if [[ -n $qtSubmodule ]]; then - find "$1/share" -printf 'share/%P\n' >> "$qtOut/nix-support/qt-inputs" - fi - fi - fi -} - -setQMakePath() { - export PATH="$qtOut/bin${PATH:+:}$PATH" -} - -qtOut="" -if [[ -z $qtSubmodule ]]; then - qtOut="$PWD/qmake-$name" -else - qtOut=$out -fi - -mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" \ - "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share" - -cp "@out@/bin/qmake" "$qtOut/bin" -cat >"$qtOut/bin/qt.conf" <<EOF -[Paths] -Prefix = $qtOut -Plugins = lib/qt5/plugins -Imports = lib/qt5/imports -Qml2Imports = lib/qt5/qml -Documentation = share/doc/qt5 -EOF -export QMAKE="$qtOut/bin/qmake" - -envHooks+=(addQtModule) -preConfigurePhases+=" setQMakePath" diff --git a/pkgs/development/libraries/qt-5/5.4/srcs.nix b/pkgs/development/libraries/qt-5/5.4/srcs.nix new file mode 100644 index 00000000000..dd873f5961b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/srcs.nix @@ -0,0 +1,245 @@ +# DO NOT EDIT! This file is generated automatically by manifest.sh +{ fetchurl, mirror }: + +{ + qtbase = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz"; + sha256 = "0x2szpjjvsrpcqw0dd3gsim7b1jv9p716pnllzjbia5mp0hggi4z"; + name = "qtbase-opensource-src-5.4.2.tar.xz"; + }; + }; + qtenginio = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtenginio-opensource-src-5.4.2.tar.xz"; + sha256 = "082i3fapjw6xs0jkz7x529dn3pb6w1pfli3cjrgvggff86gwlgwn"; + name = "qtenginio-opensource-src-5.4.2.tar.xz"; + }; + }; + qtserialport = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz"; + sha256 = "1h6p5rb0ldxgzd4md3n79gy0j9blhj736670xqjd9vlvh1743kck"; + name = "qtserialport-opensource-src-5.4.2.tar.xz"; + }; + }; + qtscript = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz"; + sha256 = "0izsmy0cr8iii78r10ndkidyljxqd2k9g03f5xb9nxacvr2f8hp0"; + name = "qtscript-opensource-src-5.4.2.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebchannel-opensource-src-5.4.2.tar.xz"; + sha256 = "0vy1zjbghfa1wirxd8fd2n2n8yryykzr09913qm2nlfbcxdsgqsn"; + name = "qtwebchannel-opensource-src-5.4.2.tar.xz"; + }; + }; + qtwinextras = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwinextras-opensource-src-5.4.2.tar.xz"; + sha256 = "0sgybvr1y2xsddlqc95ninxj3rfmd4gv7a8f7rqcxdynjan5gij0"; + name = "qtwinextras-opensource-src-5.4.2.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz"; + sha256 = "0lv1la8333qnirxmscs42xnnra0xry1gjbhi3bxrf1hrfs2im9j4"; + name = "qtwebsockets-opensource-src-5.4.2.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz"; + sha256 = "0h29cs8ajnjarhjx1aczdnxqwvg6pqs9s8w28hw488s149wqqrnj"; + name = "qtmultimedia-opensource-src-5.4.2.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz"; + sha256 = "02p8xm5ajicjam30ry3g1lm2p4nja2q0sls8dzimqrxhw5xlg3xs"; + name = "qtgraphicaleffects-opensource-src-5.4.2.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz"; + sha256 = "0ar7znqp1i02ha5ngy2kzk3hlgkafjbn2xa8j2k78gzmwsmdhzxa"; + name = "qtxmlpatterns-opensource-src-5.4.2.tar.xz"; + }; + }; + qttranslations = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz"; + sha256 = "0b4l69c16z8gjd4mq75zz3lj2gxarr9wyk0vk60jg1mi62vxvdls"; + name = "qttranslations-opensource-src-5.4.2.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz"; + sha256 = "1bj1wwms6lpj8s70y8by3j0hjsw6g9v8m6fybx68krzzizbj2c5p"; + name = "qtdeclarative-opensource-src-5.4.2.tar.xz"; + }; + }; + qtwebkit = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz"; + sha256 = "0vffbpiczag2n2hp5gc0nii8n7vkidr8f8pp8a47px0183hl6hiy"; + name = "qtwebkit-opensource-src-5.4.2.tar.xz"; + }; + }; + qtquick1 = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz"; + sha256 = "0178z15a31fw3l6933fwxs7sk0csifpwckydp3rqnn3fg5f2fwvp"; + name = "qtquick1-opensource-src-5.4.2.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz"; + sha256 = "137z3c3drxlvkdfc7zgcl0xqmavw0ladzqy0i3bq51h756qdc877"; + name = "qtquickcontrols-opensource-src-5.4.2.tar.xz"; + }; + }; + qtimageformats = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz"; + sha256 = "1nny6j9pm5ri3n1vwl5lrfrdz0fl81rx127wa49rkg2rjai2aawb"; + name = "qtimageformats-opensource-src-5.4.2.tar.xz"; + }; + }; + qtdoc = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz"; + sha256 = "15lamv6jvd7v33ldpcrazcdksv6qibdcgh4ncbyh774k8avgrlh8"; + name = "qtdoc-opensource-src-5.4.2.tar.xz"; + }; + }; + qtwayland = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz"; + sha256 = "14pmpkfq70plw07igxjaiji4vnjg5kg7izlb0wwym1lisg7bwkg0"; + name = "qtwayland-opensource-src-5.4.2.tar.xz"; + }; + }; + qtmacextras = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.xz"; + sha256 = "0h0p3s0rvd3g9rgr4hwcggdbsav2g30vijqwmdxgxd8c00yply80"; + name = "qtmacextras-opensource-src-5.4.2.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtactiveqt-opensource-src-5.4.2.tar.xz"; + sha256 = "014kwficqydciwdm1yw88yms81qm8pmi6xfhhfpbc9k85pc6jlla"; + name = "qtactiveqt-opensource-src-5.4.2.tar.xz"; + }; + }; + qtlocation = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz"; + sha256 = "1v43hl2zzi90vaw11y8dvsksrjn0r2v0br7pw6njl8lqadpg4jnw"; + name = "qtlocation-opensource-src-5.4.2.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtconnectivity-opensource-src-5.4.2.tar.xz"; + sha256 = "1nj68bzgm3r1gg171kj0acnifzb3jx0m5pf4f81xb7zl4hfxasrs"; + name = "qtconnectivity-opensource-src-5.4.2.tar.xz"; + }; + }; + qtx11extras = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz"; + sha256 = "0jgyywjxavfpiz8202g3s0g9izfl185mmak4fs9h80w1i3gn5zzn"; + name = "qtx11extras-opensource-src-5.4.2.tar.xz"; + }; + }; + qttools = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz"; + sha256 = "1d5nx01r7wxhdg9f1i9xhsvsbwgaz3yv516s068riy970bhdgwzd"; + name = "qttools-opensource-src-5.4.2.tar.xz"; + }; + }; + qtsensors = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz"; + sha256 = "1yawvjbdymgw8af7ir9zcin89xxck9dm2l6hnc43lwrky0frcvcf"; + name = "qtsensors-opensource-src-5.4.2.tar.xz"; + }; + }; + qtwebengine = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz"; + sha256 = "06cyl733prakniqrn8sd807lclk5im2vmysjdcijry2mcyah2ih8"; + name = "qtwebengine-opensource-src-5.4.2.tar.xz"; + }; + }; + qtsvg = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz"; + sha256 = "1dsyncp154xvb7d82nmnfjm0ngymnhqmliq58ljwxsjmpjlncakz"; + name = "qtsvg-opensource-src-5.4.2.tar.xz"; + }; + }; + qt5 = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qt5-opensource-src-5.4.2.tar.xz"; + sha256 = "17a0pybr4bpyv9pj7cr5hl4g31biv89bjr8zql723h0b12ql1w44"; + name = "qt5-opensource-src-5.4.2.tar.xz"; + }; + }; + qtwebkit-examples = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-examples-opensource-src-5.4.2.tar.xz"; + sha256 = "0pm9ik1j09jfb5xflc16449nff2xsfyfms7vxlcdjg4dhcqfmll8"; + name = "qtwebkit-examples-opensource-src-5.4.2.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.4.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtandroidextras-opensource-src-5.4.2.tar.xz"; + sha256 = "0krfm0wg26x7575p8isswdhrkb0jxyp169grwklil7mfw8yg3xhx"; + name = "qtandroidextras-opensource-src-5.4.2.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 4bb24427b9f..9b1324d1137 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -101,6 +101,14 @@ let qtx11extras = callPackage ./qtx11extras.nix {}; qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; + env = callPackage ../qt-env.nix {}; + full = env "qt-${qtbase.version}" [ + qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats + qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport + qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras + qtxmlpatterns + ]; + makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; }; diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch deleted file mode 100644 index ce768fec80c..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 51ae02d8c9de1cb93bf22b2519efb119dd2e39d9 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:22:55 -0600 -Subject: [PATCH 02/11] dlopen-resolv - ---- - qtbase/src/network/kernel/qdnslookup_unix.cpp | 2 +- - qtbase/src/network/kernel/qhostinfo_unix.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtbase/src/network/kernel/qdnslookup_unix.cpp b/qtbase/src/network/kernel/qdnslookup_unix.cpp -index fa782da..912ecc7 100644 ---- a/qtbase/src/network/kernel/qdnslookup_unix.cpp -+++ b/qtbase/src/network/kernel/qdnslookup_unix.cpp -@@ -79,7 +79,7 @@ static void resolveLibrary() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc/lib/resolv")); - if (!lib.load()) - return; - } -diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp -index 90a6f76..758407a 100644 ---- a/qtbase/src/network/kernel/qhostinfo_unix.cpp -+++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp -@@ -95,7 +95,7 @@ static void resolveLibrary() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); - if (!lib.load()) - return; - } --- -2.5.2 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch deleted file mode 100644 index 0f8bd78aa32..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d1f7bf62e4bab26df5deea37f08cfdd278cca47c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:23:08 -0600 -Subject: [PATCH 03/11] dlopen-gl - ---- - .../plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -index 5166372..bdeb69a 100644 ---- a/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -+++ b/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -560,7 +560,7 @@ void (*QGLXContext::getProcAddress(const QByteArray &procName)) () - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -- QLibrary lib(QLatin1String("GL")); -+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } --- -2.5.2 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch deleted file mode 100644 index 61c9b9846f5..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9fbdfd6c1231ee4778acc9a2edf297cf4b9314ac Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:33:51 -0600 -Subject: [PATCH 05/11] dlopen-libXcursor - ---- - qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -index e51ab85..7ec4b0b 100644 ---- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) - #ifdef XCB_USE_XLIB - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { --- -2.5.2 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch deleted file mode 100644 index dcd5855e824..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d060d32d8df3e320a12567ebdfc2c1d01c648168 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sun, 23 Aug 2015 08:52:27 -0500 -Subject: [PATCH 07/11] dlopen dbus - ---- - qtbase/src/dbus/qdbus_symbols.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtbase/src/dbus/qdbus_symbols.cpp b/qtbase/src/dbus/qdbus_symbols.cpp -index b82d92b..f72c9cb 100644 ---- a/qtbase/src/dbus/qdbus_symbols.cpp -+++ b/qtbase/src/dbus/qdbus_symbols.cpp -@@ -89,7 +89,7 @@ bool qdbus_loadLibDBus() - #ifdef Q_OS_WIN - QLatin1String("dbus-1"), - #endif -- QLatin1String("libdbus-1") -+ QLatin1String("@dbus_libs@/lib/libdbus-1") - }; - - lib->unload(); --- -2.5.2 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch deleted file mode 100644 index 1d7202924cd..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 44378743aa6ca21eb61de93476daa8356081c0fc Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sun, 23 Aug 2015 08:53:42 -0500 -Subject: [PATCH 09/11] decrypt ssl traffic - ---- - qtbase/src/network/ssl/qsslsocket_openssl.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp -index 049666b..e8342ab 100644 ---- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp -+++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp -@@ -48,7 +48,7 @@ - ****************************************************************************/ - - //#define QSSLSOCKET_DEBUG --//#define QT_DECRYPT_SSL_TRAFFIC -+#define QT_DECRYPT_SSL_TRAFFIC - - #include "qssl_p.h" - #include "qsslsocket_openssl_p.h" --- -2.5.2 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch deleted file mode 100644 index 3a60abb5f4a..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5113406661f06afa01da48ebc0567a4d0f69051c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sat, 17 Oct 2015 09:12:46 -0500 -Subject: [PATCH 10/11] mkspecs libgl - ---- - qtbase/mkspecs/common/linux.conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtbase/mkspecs/common/linux.conf b/qtbase/mkspecs/common/linux.conf -index 8d6fb6f..0ff9181 100644 ---- a/qtbase/mkspecs/common/linux.conf -+++ b/qtbase/mkspecs/common/linux.conf -@@ -12,8 +12,8 @@ QMAKE_INCDIR = - QMAKE_LIBDIR = - QMAKE_INCDIR_X11 = - QMAKE_LIBDIR_X11 = --QMAKE_INCDIR_OPENGL = --QMAKE_LIBDIR_OPENGL = -+QMAKE_INCDIR_OPENGL = @mesa_inc@/include -+QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib - QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL - QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL - QMAKE_INCDIR_EGL = --- -2.5.2 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch new file mode 100644 index 00000000000..08d12087f08 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch @@ -0,0 +1,16 @@ +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +@@ -68,10 +68,7 @@ void TableGenerator::initPossibleLocatio + // the QTCOMPOSE environment variable + if (qEnvironmentVariableIsSet("QTCOMPOSE")) + m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); +- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); ++ m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale")); + m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); + m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); + } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch new file mode 100644 index 00000000000..2cb3f7dfa70 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch @@ -0,0 +1,13 @@ +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp +@@ -48,7 +48,7 @@ + ****************************************************************************/ + + //#define QSSLSOCKET_DEBUG +-//#define QT_DECRYPT_SSL_TRAFFIC ++#define QT_DECRYPT_SSL_TRAFFIC + + #include "qssl_p.h" + #include "qsslsocket_openssl_p.h" diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index 1ec89acfcd2..8f771f1f621 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, makeWrapper +{ stdenv, lib, fetchurl, copyPathsToStore, makeWrapper , srcs , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi @@ -23,11 +23,9 @@ , decryptSslTraffic ? false }: -with stdenv.lib; - let inherit (srcs.qt5) version; - system-x86_64 = elem stdenv.system platforms.x86_64; + system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; in stdenv.mkDerivation { @@ -43,71 +41,63 @@ stdenv.mkDerivation { mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase ''; - prePatch = '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace qtbase/configure --replace /bin/pwd pwd - substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ - --replace /usr/share/X11/locale ${libX11.out}/share/X11/locale \ - --replace /usr/lib/X11/locale ${libX11.out}/share/X11/locale - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf - ''; - patches = - let dlopen-gtkstyle = substituteAll { - src = ./0001-dlopen-gtkstyle.patch; - # substituteAll ignores env vars starting with capital letter - gconf = GConf.out; - gtk = gtk.out; + copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ lib.optional gtkStyle ./dlopen-gtkstyle.patch + ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch + ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; + + postPatch = + '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace qtbase/configure --replace /bin/pwd pwd + substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf libgnomeui = libgnomeui.out; gnome_vfs = gnome_vfs.out; - }; - dlopen-resolv = substituteAll { - src = ./0002-dlopen-resolv.patch; - glibc = stdenv.cc.libc.out; - }; - dlopen-gl = substituteAll { - src = ./0003-dlopen-gl.patch; - openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; - }; - tzdir = ./0004-tzdir.patch; - dlopen-libXcursor = substituteAll { - src = ./0005-dlopen-libXcursor.patch; - libXcursor = libXcursor.out; - }; - dlopen-openssl = substituteAll { - src = ./0006-dlopen-openssl.patch; - openssl = openssl.out; - }; - dlopen-dbus = substituteAll { - src = ./0007-dlopen-dbus.patch; - dbus_libs = dbus.lib; - }; - xdg-config-dirs = ./0008-xdg-config-dirs.patch; - decrypt-ssl-traffic = ./0009-decrypt-ssl-traffic.patch; - mkspecs-libgl = substituteAll { - src = ./0010-mkspecs-libgl.patch; - mesa_inc = mesa.dev; - mesa_lib = mesa.out; - }; - nix-profiles-library-paths = ./0011-nix-profiles-library-paths.patch; - in [ - dlopen-resolv dlopen-gl tzdir dlopen-libXcursor dlopen-openssl - dlopen-dbus xdg-config-dirs nix-profiles-library-paths - ] - ++ optional gtkStyle dlopen-gtkstyle - ++ optional decryptSslTraffic decrypt-ssl-traffic - ++ optional mesaSupported mkspecs-libgl; + + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in" + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake" + sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in" + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" + + substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \ + --replace "@glibc@" "${stdenv.cc.libc}" + substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \ + --replace "@glibc@" "${stdenv.cc.libc}" + + substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \ + --replace "@libXcursor@" "${libXcursor}" + + substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \ + --replace "@openssl@" "${openssl}" + + substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \ + --replace "@dbus_libs@" "${dbus}" + + substituteInPlace \ + qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ + --replace "@libX11@" "${libX11}" + '' + + lib.optionalString gtkStyle '' + substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}" + substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \ + --replace "@gtk@" "${gtk}" \ + --replace "@gnome_vfs@" "${gnome_vfs}" \ + --replace "@libgnomeui@" "${libgnomeui}" \ + --replace "@gconf@" "${GConf}" + '' + + lib.optionalString mesaSupported '' + substituteInPlace \ + qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ + --replace "@mesa@" "${mesa}" + substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}" + ''; preConfigure = '' - export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in" - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake" - sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in" - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" - export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" export configureFlags+=" -docdir $out/share/doc/qt5" ''; @@ -124,7 +114,7 @@ stdenv.mkDerivation { -release -shared -c++11 - ${optionalString developerBuild "-developer-build"} + ${lib.optionalString developerBuild "-developer-build"} -largefile -accessibility -rpath @@ -145,15 +135,15 @@ stdenv.mkDerivation { -glib -xcb -qpa xcb - -${optionalString (cups == null) "no-"}cups - -${optionalString (!gtkStyle) "no-"}gtkstyle + -${lib.optionalString (cups == null) "no-"}cups + -${lib.optionalString (!gtkStyle) "no-"}gtkstyle -no-eglfs -no-directfb -no-linuxfb -no-kms - ${optionalString (!system-x86_64) "-no-sse2"} + ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 -no-sse4.1 @@ -177,14 +167,14 @@ stdenv.mkDerivation { -make libs -make tools - -${optionalString (buildExamples == false) "no"}make examples - -${optionalString (buildTests == false) "no"}make tests + -${lib.optionalString (buildExamples == false) "no"}make examples + -${lib.optionalString (buildTests == false) "no"}make tests ''; # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag # if dependency paths contain the string "pq", which can occur in the hash. # To prevent these failures, we need to override PostgreSQL detection. - PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; + PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; propagatedBuildInputs = [ xlibs.libXcomposite libX11 libxcb libXext libXrender libXi @@ -194,15 +184,15 @@ stdenv.mkDerivation { ] # Qt doesn't directly need GLU (just GL), but many apps use, it's small and # doesn't remain a runtime-dep if not used - ++ optionals mesaSupported [ mesa mesa_glu ] - ++ optional (cups != null) cups - ++ optional (mysql != null) mysql.lib - ++ optional (postgresql != null) postgresql - ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; + ++ lib.optionals mesaSupported [ mesa mesa_glu ] + ++ lib.optional (cups != null) cups + ++ lib.optional (mysql != null) mysql.lib + ++ lib.optional (postgresql != null) postgresql + ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; buildInputs = [ bison flex gperf ruby ] - ++ optional developerBuild gdb; + ++ lib.optional developerBuild gdb; nativeBuildInputs = [ python perl pkgconfig ]; @@ -213,12 +203,11 @@ stdenv.mkDerivation { postInstall = '' - ${optionalString buildDocs '' - make docs && make install_docs - ''} - # Don't retain build-time dependencies like gdb and ruby. sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri + '' + + lib.optionalString buildDocs '' + make docs && make install_docs ''; inherit lndir; @@ -226,7 +215,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = http://qt-project.org; description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch new file mode 100644 index 00000000000..401cfd5c295 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch @@ -0,0 +1,13 @@ +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/dbus/qdbus_symbols.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp +@@ -89,7 +89,7 @@ bool qdbus_loadLibDBus() + #ifdef Q_OS_WIN + QLatin1String("dbus-1"), + #endif +- QLatin1String("libdbus-1") ++ QLatin1String("@dbus_libs@/lib/libdbus-1") + }; + + lib->unload(); diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch new file mode 100644 index 00000000000..14411a95f3a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch @@ -0,0 +1,17 @@ +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const + { + extern const QString qt_gl_library_name(); + // QLibrary lib(qt_gl_library_name()); ++ // Check system library paths first + QLibrary lib(QLatin1String("GL")); ++ if (!lib.load()) { ++ // Fallback to Mesa driver ++ lib.setFileName(QLatin1String("@mesa@/lib/libGL")); ++ } + glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + } + } diff --git a/pkgs/development/libraries/qt-5/5.4/0001-dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gtkstyle.patch index 3f411139f5b..ad1719c46e2 100644 --- a/pkgs/development/libraries/qt-5/5.4/0001-dlopen-gtkstyle.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gtkstyle.patch @@ -1,18 +1,8 @@ -From 35d5995a58c86a6addbf0aaf0d1be64d39182872 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:21:58 -0600 -Subject: [PATCH] dlopen-gtkstyle - ---- - qtbase/src/widgets/styles/qgtk2painter.cpp | 2 +- - qtbase/src/widgets/styles/qgtkstyle_p.cpp | 12 ++++++------ - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/qtbase/src/widgets/styles/qgtk2painter.cpp b/qtbase/src/widgets/styles/qgtk2painter.cpp -index 7b9bd97..075947a 100644 ---- a/qtbase/src/widgets/styles/qgtk2painter.cpp -+++ b/qtbase/src/widgets/styles/qgtk2painter.cpp -@@ -104,7 +104,7 @@ static void initGtk() +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtk2painter.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/widgets/styles/qgtk2painter.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtk2painter.cpp +@@ -96,7 +96,7 @@ static void initGtk() static bool initialized = false; if (!initialized) { // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 @@ -21,11 +11,11 @@ index 7b9bd97..075947a 100644 QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new"); QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable"); -diff --git a/qtbase/src/widgets/styles/qgtkstyle_p.cpp b/qtbase/src/widgets/styles/qgtkstyle_p.cpp -index 2c64225..3343d32 100644 ---- a/qtbase/src/widgets/styles/qgtkstyle_p.cpp -+++ b/qtbase/src/widgets/styles/qgtkstyle_p.cpp -@@ -334,7 +334,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus(GtkWidget *widget, bool focus) +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/widgets/styles/qgtkstyle_p.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp +@@ -327,7 +327,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus void QGtkStylePrivate::resolveGtk() const { // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 @@ -34,7 +24,7 @@ index 2c64225..3343d32 100644 gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); -@@ -432,8 +432,8 @@ void QGtkStylePrivate::resolveGtk() const +@@ -425,8 +425,8 @@ void QGtkStylePrivate::resolveGtk() cons pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); @@ -45,7 +35,7 @@ index 2c64225..3343d32 100644 } /* \internal -@@ -601,9 +601,9 @@ void QGtkStylePrivate::cleanupGtkWidgets() +@@ -594,9 +594,9 @@ void QGtkStylePrivate::cleanupGtkWidgets static bool resolveGConf() { if (!QGtkStylePrivate::gconf_client_get_default) { @@ -58,6 +48,3 @@ index 2c64225..3343d32 100644 } return (QGtkStylePrivate::gconf_client_get_default !=0); } --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch new file mode 100644 index 00000000000..e66ce1676d3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch @@ -0,0 +1,17 @@ +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c + #ifdef XCB_USE_XLIB + static bool function_ptrs_not_initialized = true; + if (function_ptrs_not_initialized) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); ++ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); + bool xcursorFound = xcursorLib.load(); + if (!xcursorFound) { // try without the version number +- xcursorLib.setFileName(QLatin1String("Xcursor")); ++ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch index ad48133d93f..1cc6fac583b 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch @@ -1,17 +1,8 @@ -From 2d7e4e21291238e2b41d0e173f918cd3530c8ade Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sun, 23 Aug 2015 08:52:04 -0500 -Subject: [PATCH 06/11] dlopen openssl - ---- - qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -index e2700df..a7ccf88 100644 ---- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -640,8 +640,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl() +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -640,8 +640,8 @@ static QPair<QLibrary*, QLibrary*> loadO #endif #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> @@ -22,7 +13,7 @@ index e2700df..a7ccf88 100644 if (libcrypto->load() && libssl->load()) { // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found return pair; -@@ -658,8 +658,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl() +@@ -658,8 +658,8 @@ static QPair<QLibrary*, QLibrary*> loadO // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third // attempt, _after_ <bundle>/Contents/Frameworks has been searched. // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. @@ -33,6 +24,3 @@ index e2700df..a7ccf88 100644 if (libcrypto->load() && libssl->load()) { // libssl.so.0 and libcrypto.so.0 found return pair; --- -2.5.2 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch new file mode 100644 index 00000000000..a79c806462f --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch @@ -0,0 +1,26 @@ +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qdnslookup_unix.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp +@@ -79,7 +79,7 @@ static void resolveLibrary() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc/lib/resolv")); + if (!lib.load()) + return; + } +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qhostinfo_unix.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp +@@ -95,7 +95,7 @@ static void resolveLibrary() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch new file mode 100644 index 00000000000..e483ad14e05 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch @@ -0,0 +1,36 @@ +From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sat, 10 Oct 2015 01:15:01 +0200 +Subject: [PATCH] Fix compilation with libressl + +By additionally checking for defined(SSL_CTRL_SET_CURVES), which +is defined in openssl, but not in libressl. +--- + src/network/ssl/qsslcontext_openssl.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtbase/src/network/ssl/qsslcontext_openssl.cpp b/qtbase/src/network/ssl/qsslcontext_openssl.cpp +index b88ab54..cfc4f6d 100644 +--- a/qtbase/src/network/ssl/qsslcontext_openssl.cpp ++++ b/qtbase/src/network/ssl/qsslcontext_openssl.cpp +@@ -338,7 +338,7 @@ init_context: + + const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); + if (!qcurves.isEmpty()) { +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) + // Set the curves to be used + if (q_SSLeay() >= 0x10002000L) { + // SSL_CTX_ctrl wants a non-const pointer as last argument, +@@ -352,7 +352,7 @@ init_context: + return sslContext; + } + } else +-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) ++#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) + { + // specific curves requested, but not possible to set -> error + sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); +-- +2.6.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch new file mode 100644 index 00000000000..10115e8144a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch @@ -0,0 +1,15 @@ +Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/mkspecs/common/linux.conf ++++ qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf +@@ -12,8 +12,8 @@ QMAKE_INCDIR = + QMAKE_LIBDIR = + QMAKE_INCDIR_X11 = + QMAKE_LIBDIR_X11 = +-QMAKE_INCDIR_OPENGL = +-QMAKE_LIBDIR_OPENGL = ++QMAKE_INCDIR_OPENGL = @mesa@/include ++QMAKE_LIBDIR_OPENGL = @mesa@/lib + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL + QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch new file mode 100644 index 00000000000..470526b1dcd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch @@ -0,0 +1,26 @@ +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplication.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplication.cpp +@@ -2498,6 +2498,21 @@ QStringList QCoreApplication::libraryPat + } + } + } ++ ++ // Add library paths derived from NIX_PROFILES. ++ const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); ++ if (!nixProfilesEnv.isEmpty()) { ++ QLatin1Char pathSep(' '); ++ QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/lib/qt5/plugins"); ++ QString canonicalPath = QDir(*it).canonicalPath(); ++ if (!canonicalPath.isEmpty() ++ && !app_libpaths->contains(canonicalPath)) { ++ app_libpaths->append(canonicalPath); ++ } ++ } ++ } + } + return *(coreappdata()->app_libpaths); + } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/series b/pkgs/development/libraries/qt-5/5.5/qtbase/series new file mode 100644 index 00000000000..2196d838375 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/series @@ -0,0 +1,9 @@ +dlopen-resolv.patch +tzdir.patch +dlopen-libXcursor.patch +dlopen-openssl.patch +dlopen-dbus.patch +xdg-config-dirs.patch +nix-profiles-library-paths.patch +compose-search-path.patch +libressl.patch diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch index c2564df4e1a..92adeda8273 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch @@ -1,17 +1,8 @@ -From 26c73d6da84f1b4797421b9ddecef18d6ce588f0 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 1 Dec 2014 17:23:22 -0600 -Subject: [PATCH 04/11] tzdir - ---- - qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -index 29f0e17..3878974 100644 ---- a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -62,7 +62,10 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -62,7 +62,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -23,7 +14,7 @@ index 29f0e17..3878974 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -553,12 +556,18 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) +@@ -560,12 +563,18 @@ void QTzTimeZonePrivate::init(const QByt if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -47,6 +38,3 @@ index 29f0e17..3878974 100644 } } --- -2.5.2 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch index ebb572081bf..24dc3bde148 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch @@ -1,18 +1,8 @@ -From 253c0829d4bc30da0152a22114a949449796ec7d Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sun, 23 Aug 2015 08:52:57 -0500 -Subject: [PATCH 08/11] xdg config dirs - ---- - qtbase/src/corelib/io/qsettings.cpp | 18 ++++++++++++++++++ - qtbase/src/corelib/io/qsettings_p.h | 2 +- - 2 files changed, 19 insertions(+), 1 deletion(-) - -diff --git a/qtbase/src/corelib/io/qsettings.cpp b/qtbase/src/corelib/io/qsettings.cpp -index 413f569..8ff4974 100644 ---- a/qtbase/src/corelib/io/qsettings.cpp -+++ b/qtbase/src/corelib/io/qsettings.cpp -@@ -1131,6 +1131,24 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format, +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/io/qsettings.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings.cpp +@@ -1131,6 +1131,24 @@ QConfFileSettingsPrivate::QConfFileSetti if (!application.isEmpty()) confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false)); @@ -37,10 +27,10 @@ index 413f569..8ff4974 100644 #else QString confName = getPath(format, QSettings::UserScope) + org; if (!application.isEmpty()) -diff --git a/qtbase/src/corelib/io/qsettings_p.h b/qtbase/src/corelib/io/qsettings_p.h -index 93d63fd..160b197 100644 ---- a/qtbase/src/corelib/io/qsettings_p.h -+++ b/qtbase/src/corelib/io/qsettings_p.h +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings_p.h +=================================================================== +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/io/qsettings_p.h ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings_p.h @@ -240,7 +240,7 @@ public: F_Organization = 0x1, F_User = 0x0, @@ -50,6 +40,3 @@ index 93d63fd..160b197 100644 #else SandboxConfFile = 0, NumConfFiles = 1 --- -2.5.2 - diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix index e6973015aca..11c6ac74d5f 100644 --- a/pkgs/development/libraries/qt-5/qt-env.nix +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -1,8 +1,6 @@ -{ runCommand, lndir }: +{ runCommand, lndir, qtbase }: name: paths: -{ paths, qtbase }: - -runCommand "qt-env" { inherit paths qtbase; } '' +runCommand name { inherit paths qtbase; } '' mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share" diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 119fda9eb80..4db9d8b4665 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installFlags = "INSTALL_ROOT=$(out)"; - buildInputs = [ zlib (qt.base or qt) ]; + buildInputs = [ zlib qt ]; meta = { description = "Provides access to ZIP archives from Qt programs"; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index 822b888843e..d4819d70bfc 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5 }: +{ stdenv, fetchurl, qtbase, qtsvg, qttools }: stdenv.mkDerivation rec { name = "qwt-6.1.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "031x4hz1jpbirv9k35rqb52bb9mf2w7qav89qv1yfw1r3n6z221b"; }; - propagatedBuildInputs = [ qt5.base qt5.svg qt5.tools ]; + propagatedBuildInputs = [ qtbase qtsvg qttools ]; postPatch = '' sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix index 98619854c1e..78dbe136672 100644 --- a/pkgs/development/libraries/qxt/default.nix +++ b/pkgs/development/libraries/qxt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.2"; src = fetchzip { - url = "http://dev.libqxt.org/libqxt/get/v${version}.tar.gz"; + url = "https://bitbucket.org/libqxt/libqxt/get/v${version}.tar.gz"; sha256 = "0zmqfn0h8cpky7wgaaxlfh0l89r9r0isi87587kaicyap7a6kxwz"; }; @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { Development Frameworks, Nokia. ''; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ forkk ]; }; } diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 58326a6fa50..c9f9bcfa9a7 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,27 +1,30 @@ -{ stdenv, fetchurl, gfortran, openblas }: +{ stdenv, lib, copyPathsToStore, fetchurl, autoconf, automake, gettext, libtool +, gfortran, openblas }: with stdenv.lib; let - version = "3.2.0"; + version = "3.3.0"; in stdenv.mkDerivation { name = "arpack-${version}"; + src = fetchurl { url = "https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz"; - sha256 = "1fwch6vipms1ispzg2djvbzv5wag36f1dmmr3xs3mbp6imfyhvff"; + sha256 = "1cz53wqzcf6czmcpfb3vb61xi0rn5bwhinczl65hpmbrglg82ndd"; }; + nativeBuildInputs = [ autoconf automake gettext libtool ]; buildInputs = [ gfortran openblas ]; - # Auto-detection fails because gfortran brings in BLAS by default - configureFlags = [ - "--with-blas=-lopenblas" - "--with-lapack=-lopenblas" - ]; + BLAS_LIBS = "-L${openblas}/lib -lopenblas"; FFLAGS = optional openblas.blas64 "-fdefault-integer-8"; + preConfigure = '' + ./bootstrap + ''; + meta = { homepage = "http://github.com/opencollab/arpack-ng"; description = '' diff --git a/pkgs/development/libraries/signon/old.nix b/pkgs/development/libraries/signon/old.nix deleted file mode 100644 index bf211c3b8a3..00000000000 --- a/pkgs/development/libraries/signon/old.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, doxygen, qt5 }: - -stdenv.mkDerivation rec { - name = "signon-${version}"; - version = "8.57"; - src = fetchurl { - url = "https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=${version}"; - sha256 = "1vqkxhmdjk3217k38l2s3wld8x7f4jrbbh6xbr036cn1r23ncni5"; - }; - - buildInputs = [ qt5.base ]; - nativeBuildInputs = [ doxygen ]; - - configurePhase = '' - qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5 - ''; - -} diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index 637b8b8ab7f..a5559e87aad 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.0.4"; src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/mozilla.org/directory/svrcore/releases/${version}/src/${name}.tar.bz2"; + url = "https://ftp.mozilla.org/pub/directory/svrcore/releases/${version}/src/${name}.tar.bz2"; sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7"; }; diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index 05fe67eb9d7..882116bd3f1 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -3,9 +3,14 @@ stdenv.mkDerivation rec { name = "taglib-extras-1.0.1"; src = fetchurl { - url = "http://www.kollide.net/~jefferai/${name}.tar.gz"; + url = "http://ftp.rz.uni-wuerzburg.de/pub/unix/kde/taglib-extras/1.0.1/src/${name}.tar.gz"; sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y"; }; buildInputs = [ taglib ]; nativeBuildInputs = [ cmake ]; + + # Workaround for upstream bug https://bugs.kde.org/show_bug.cgi?id=357181 + preConfigure = '' + sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake + ''; } diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index a5185689ee0..88eecd0703c 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -1,17 +1,14 @@ -{ stdenv, fetchurl, telepathy_glib, farstream, gst_plugins_base, dbus_glib -, pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }: +{ stdenv, fetchurl, pkgconfig, telepathy_glib, farstream, dbus_glib }: stdenv.mkDerivation rec { - name = "${pname}-0.6.1"; + name = "${pname}-0.6.2"; pname = "telepathy-farstream"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "0ia8nldxxan1cvplr62aicjhfcrm27s3qyk0x46c8q0fmqvnzlm3"; + sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g"; }; - buildInputs = [ gst_plugins_base gst_python pygobject ]; - - propagatedBuildInputs = [ dbus_glib telepathy_glib gstreamer farstream ]; - nativeBuildInputs = [ pkgconfig python libxslt]; + propagatedBuildInputs = [ dbus_glib telepathy_glib farstream ]; + nativeBuildInputs = [ pkgconfig ]; } diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 7ef48d09725..1052e92d380 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib, dbus_daemon -, telepathy_farstream, telepathy_glib, pythonDBus }: +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python, dbus_glib, dbus_daemon +, telepathy_farstream, telepathy_glib, pythonDBus, fetchpatch }: stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.5"; + name = "telepathy-qt-0.9.6"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk"; + sha256 = "0j7hs055cx5g9chn3b2p0arig70m5g9547qgqvk29kxdyxxxsmqc"; }; + patches = [(fetchpatch { + name = "gst-1.6.patch"; + url = "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch" + + "/?id=ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb"; + sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2"; + })]; - nativeBuildInputs = [ cmake pkgconfig python libxslt ]; - propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; + nativeBuildInputs = [ cmake pkgconfig python ]; + propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; buildInputs = stdenv.lib.optional doCheck dbus_daemon; + cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}"; + preBuild = '' NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" ''; diff --git a/pkgs/development/libraries/telepathy/qt5/default.nix b/pkgs/development/libraries/telepathy/qt5/default.nix deleted file mode 100644 index 1c18e844689..00000000000 --- a/pkgs/development/libraries/telepathy/qt5/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python, libxslt, dbus_glib, dbus_daemon -, telepathy_farstream, telepathy_glib, pythonDBus }: - -stdenv.mkDerivation rec { - name = "telepathy-qt5-0.9.5"; - - src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk"; - }; - - nativeBuildInputs = [ cmake pkgconfig python libxslt ]; - propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; - - cmakeFlags = [ "-DDESIRED_QT_VERSION=5" ]; - - buildInputs = stdenv.lib.optional doCheck dbus_daemon; - - preBuild = '' - NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" - ''; - - enableParallelBuilding = true; - doCheck = false; # giving up for now - - meta = { - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/telepathy/qt5/old.nix b/pkgs/development/libraries/telepathy/qt5/old.nix deleted file mode 100644 index 50d569f3091..00000000000 --- a/pkgs/development/libraries/telepathy/qt5/old.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, cmake, qt5, pkgconfig, python, libxslt, dbus_glib, dbus_daemon -, telepathy_farstream, telepathy_glib, pythonDBus }: - -stdenv.mkDerivation rec { - name = "telepathy-qt5-0.9.5"; - - src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk"; - }; - - nativeBuildInputs = [ cmake pkgconfig python libxslt ]; - propagatedBuildInputs = [ qt5.base dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; - - cmakeFlags = [ "-DDESIRED_QT_VERSION=5" ]; - - buildInputs = stdenv.lib.optional doCheck dbus_daemon; - - preBuild = '' - NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" - ''; - - enableParallelBuilding = true; - doCheck = false; # giving up for now - - meta = { - platforms = stdenv.lib.platforms.linux; - }; -} |