From 096c00803656ad60a22b2750dde7c0a07c4ba8f6 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Sat, 13 May 2017 23:14:43 +0200 Subject: Fix #25723: Remove old GNU libstdc++ for qtbase --- pkgs/development/libraries/qt-5/5.8/qtbase/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix index e11d9dd1f29..88684d9a753 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL - darwin.cf-private darwin.apple_sdk.sdk darwin.libobjc libiconv + darwin.cf-private darwin.libobjc libiconv ]); buildInputs = [ ] -- cgit 1.4.1 From e6c65ecb12c58cfa043d9cfa6db31b9920603588 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 12 May 2017 18:38:27 +0200 Subject: tree-wide: remove uses of features.grsecurity --- nixos/modules/config/sysctl.nix | 5 +---- pkgs/development/libraries/accelio/default.nix | 3 +-- pkgs/os-specific/linux/batman-adv/default.nix | 1 - pkgs/os-specific/linux/kernel-headers/default.nix | 2 -- pkgs/os-specific/linux/lttng-modules/default.nix | 1 - pkgs/os-specific/linux/rtl8723bs/default.nix | 3 +-- pkgs/os-specific/linux/rtl8812au/default.nix | 1 - pkgs/servers/openafs-client/default.nix | 3 +-- 8 files changed, 4 insertions(+), 15 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index a3f7e8f722f..2114fb2b9d4 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -60,10 +60,7 @@ in # Hide kernel pointers (e.g. in /proc/modules) for unprivileged # users as these make it easier to exploit kernel vulnerabilities. - # - # Removed under grsecurity. - boot.kernel.sysctl."kernel.kptr_restrict" = - if (config.boot.kernelPackages.kernel.features.grsecurity or false) then null else 1; + boot.kernel.sysctl."kernel.kptr_restrict" = 1; # Disable YAMA by default to allow easy debugging. boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0; diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix index 002b26078f5..a1f229ca5fb 100644 --- a/pkgs/development/libraries/accelio/default.nix +++ b/pkgs/development/libraries/accelio/default.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ wkennington ]; # kernel 4.2 is the most recent supported kernel broken = kernel != null && - (builtins.compareVersions kernel.version "4.2" == 1 || - (kernel.features.grsecurity or false)); + (builtins.compareVersions kernel.version "4.2" == 1); }; } diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 1449d85fc16..a48909685d7 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; platforms = with stdenv.lib.platforms; linux; - broken = (kernel.features.grsecurity or false); }; } diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index da9f3009474..a33d24fc847 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,7 +1,5 @@ { stdenv, kernel, perl }: -assert (!(kernel.features.grsecurity or false)); - let baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ]; in stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 3bb61227fe4..2f5b50b3b58 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.bjornfor ]; broken = (builtins.compareVersions kernel.version "3.18" == -1) || - (kernel.features.grsecurity or false) || (kernel.features.chromiumos or false); }; diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index 05dd0f8ebb9..eb90ac30344 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -35,8 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hadess/rtl8723bs"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - broken = (! versionAtLeast kernel.version "3.19") - || (kernel.features.grsecurity or false); + broken = (! versionAtLeast kernel.version "3.19"); maintainers = with maintainers; [ elitak ]; }; } diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 6b1e93e59df..93c8e5b7ae4 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Grawp/rtl8812au_rtl8821au"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - broken = (kernel.features.grsecurity or false); }; } diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 6383ce12bc1..fe7a34e0be8 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.z77z ]; broken = (builtins.compareVersions kernel.version "3.18" == -1) || - (builtins.compareVersions kernel.version "4.4" != -1) || - (kernel.features.grsecurity or false); + (builtins.compareVersions kernel.version "4.4" != -1); }; } -- cgit 1.4.1 From 88a5082edf54a5ec3ae70aedfdfb143f245393bb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 10 May 2017 15:57:24 -0500 Subject: Revert "qt58: ignore NIX_PROFILES environment variable" This reverts commit 6169bd98f51429d7da4f2fc296357d8e6d828751. --- .../5.6/qtbase/nix-profiles-library-paths.patch | 20 ++++++++++++++++++++ pkgs/development/libraries/qt-5/5.6/qtbase/series | 1 + .../5.8/qtbase/nix-profiles-library-paths.patch | 22 ++++++++++++++++++++++ pkgs/development/libraries/qt-5/5.8/qtbase/series | 1 + 4 files changed, 44 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch new file mode 100644 index 00000000000..68163fc0c31 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch @@ -0,0 +1,20 @@ +Index: qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp +=================================================================== +--- qtbase-opensource-src-5.6.2.orig/src/corelib/kernel/qcoreapplication.cpp ++++ qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp +@@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPat + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from NIX_PROFILES. ++ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); ++ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins"); ++ for (const QByteArray &profile: profiles) { ++ if (!profile.isEmpty()) { ++ app_libpaths->append(QFile::decodeName(profile) + plugindir); ++ } ++ } ++ + const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); + if (!libPathEnv.isEmpty()) { + QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series index 9ef8c998c66..2196d838375 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series @@ -4,5 +4,6 @@ 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.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch new file mode 100644 index 00000000000..c5d91066d8f --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch @@ -0,0 +1,22 @@ +Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp +=================================================================== +--- qtbase-opensource-src-5.8.0.orig/src/corelib/kernel/qcoreapplication.cpp ++++ qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp +@@ -2476,7 +2476,17 @@ QStringList QCoreApplication::libraryPat + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from NIX_PROFILES. ++ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); ++ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins"); ++ for (const QByteArray &profile: profiles) { ++ if (!profile.isEmpty()) { ++ app_libpaths->append(QFile::decodeName(profile) + plugindir); ++ } ++ } ++ + const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); ++ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes + if (!libPathEnv.isEmpty()) { + QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); + for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) { diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series index 0378ca1f503..6f6942b4444 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series @@ -2,6 +2,7 @@ dlopen-resolv.patch tzdir.patch dlopen-libXcursor.patch xdg-config-dirs.patch +nix-profiles-library-paths.patch libressl.patch qpa-plugin-path.patch dlopen-gl.patch -- cgit 1.4.1 From 7c338b7df8e35fab4c08a494bff6018f8fb1be72 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 13 May 2017 09:16:13 -0500 Subject: qtbase: search platform plugin paths before other plugin paths --- .../libraries/qt-5/5.6/qtbase/default.nix | 2 + .../qt-5/5.6/qtbase/qpa-platform-plugin-path.patch | 43 ++++++++++++++++++++++ pkgs/development/libraries/qt-5/5.6/qtbase/series | 1 + .../libraries/qt-5/5.8/qtbase/default.nix | 2 +- .../5.8/qtbase/nix-profiles-library-paths.patch | 4 +- .../qt-5/5.8/qtbase/qpa-platform-plugin-path.patch | 43 ++++++++++++++++++++++ .../qt-5/5.8/qtbase/qpa-plugin-path.patch | 15 -------- pkgs/development/libraries/qt-5/5.8/qtbase/series | 2 +- 8 files changed, 92 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/qpa-platform-plugin-path.patch create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index b26fc7faf9d..289a1bbac6c 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -104,6 +104,8 @@ stdenv.mkDerivation { -importdir $out/lib/qt5/imports \ -qmldir $out/lib/qt5/qml \ -docdir $out/share/doc/qt5" + + NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/lib/qt5/plugins/platforms\"" ''; prefixKey = "-prefix "; diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/qpa-platform-plugin-path.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/qpa-platform-plugin-path.patch new file mode 100644 index 00000000000..32d9dcad622 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/qpa-platform-plugin-path.patch @@ -0,0 +1,43 @@ +Index: qtbase-opensource-src-5.6.2/src/gui/kernel/qplatformintegrationfactory.cpp +=================================================================== +--- qtbase-opensource-src-5.6.2.orig/src/gui/kernel/qplatformintegrationfactory.cpp ++++ qtbase-opensource-src-5.6.2/src/gui/kernel/qplatformintegrationfactory.cpp +@@ -67,9 +67,10 @@ QPlatformIntegration *QPlatformIntegrati + // Try loading the plugin from platformPluginPath first: + if (!platformPluginPath.isEmpty()) { + QCoreApplication::addLibraryPath(platformPluginPath); +- if (QPlatformIntegration *ret = loadIntegration(directLoader(), platform, paramList, argc, argv)) +- return ret; + } ++ QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH)); ++ if (QPlatformIntegration *ret = loadIntegration(directLoader(), platform, paramList, argc, argv)) ++ return ret; + if (QPlatformIntegration *ret = loadIntegration(loader(), platform, paramList, argc, argv)) + return ret; + #else +@@ -95,15 +96,16 @@ QStringList QPlatformIntegrationFactory: + QStringList list; + if (!platformPluginPath.isEmpty()) { + QCoreApplication::addLibraryPath(platformPluginPath); +- list = directLoader()->keyMap().values(); +- if (!list.isEmpty()) { +- const QString postFix = QStringLiteral(" (from ") +- + QDir::toNativeSeparators(platformPluginPath) +- + QLatin1Char(')'); +- const QStringList::iterator end = list.end(); +- for (QStringList::iterator it = list.begin(); it != end; ++it) +- (*it).append(postFix); +- } ++ } ++ QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH)); ++ list = directLoader()->keyMap().values(); ++ if (!list.isEmpty()) { ++ const QString postFix = QStringLiteral(" (from ") ++ + QDir::toNativeSeparators(platformPluginPath) ++ + QLatin1Char(')'); ++ const QStringList::iterator end = list.end(); ++ for (QStringList::iterator it = list.begin(); it != end; ++it) ++ (*it).append(postFix); + } + list.append(loader()->keyMap().values()); + return list; diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series index 2196d838375..3527a91c84d 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series @@ -7,3 +7,4 @@ xdg-config-dirs.patch nix-profiles-library-paths.patch compose-search-path.patch libressl.patch +qpa-platform-plugin-path.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix index e11d9dd1f29..403c7f2636b 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation { -qmldir $out/lib/qt5/qml \ -docdir $out/share/doc/qt5" - NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/lib/qt5/plugins\"" + NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/lib/qt5/plugins/platforms\"" ''; diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch index c5d91066d8f..553c71d0ace 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch @@ -2,7 +2,7 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp =================================================================== --- qtbase-opensource-src-5.8.0.orig/src/corelib/kernel/qcoreapplication.cpp +++ qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp -@@ -2476,7 +2476,17 @@ QStringList QCoreApplication::libraryPat +@@ -2476,6 +2476,15 @@ QStringList QCoreApplication::libraryPat QStringList *app_libpaths = new QStringList; coreappdata()->app_libpaths.reset(app_libpaths); @@ -16,7 +16,5 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp + } + const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); -+ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes if (!libPathEnv.isEmpty()) { QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); - for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) { diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch new file mode 100644 index 00000000000..270116e1978 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch @@ -0,0 +1,43 @@ +Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cpp +=================================================================== +--- qtbase-opensource-src-5.8.0.orig/src/gui/kernel/qplatformintegrationfactory.cpp ++++ qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cpp +@@ -62,9 +62,10 @@ QPlatformIntegration *QPlatformIntegrati + // Try loading the plugin from platformPluginPath first: + if (!platformPluginPath.isEmpty()) { + QCoreApplication::addLibraryPath(platformPluginPath); +- if (QPlatformIntegration *ret = qLoadPlugin(directLoader(), platform, paramList, argc, argv)) +- return ret; + } ++ QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH)); ++ if (QPlatformIntegration *ret = qLoadPlugin(directLoader(), platform, paramList, argc, argv)) ++ return ret; + #else + Q_UNUSED(platformPluginPath); + #endif +@@ -84,15 +85,16 @@ QStringList QPlatformIntegrationFactory: + #ifndef QT_NO_LIBRARY + if (!platformPluginPath.isEmpty()) { + QCoreApplication::addLibraryPath(platformPluginPath); +- list = directLoader()->keyMap().values(); +- if (!list.isEmpty()) { +- const QString postFix = QLatin1String(" (from ") +- + QDir::toNativeSeparators(platformPluginPath) +- + QLatin1Char(')'); +- const QStringList::iterator end = list.end(); +- for (QStringList::iterator it = list.begin(); it != end; ++it) +- (*it).append(postFix); +- } ++ } ++ QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH)); ++ list = directLoader()->keyMap().values(); ++ if (!list.isEmpty()) { ++ const QString postFix = QLatin1String(" (from ") ++ + QDir::toNativeSeparators(platformPluginPath) ++ + QLatin1Char(')'); ++ const QStringList::iterator end = list.end(); ++ for (QStringList::iterator it = list.begin(); it != end; ++it) ++ (*it).append(postFix); + } + #else + Q_UNUSED(platformPluginPath); diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch deleted file mode 100644 index 6d40ed19c00..00000000000 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qguiapplication.cpp -=================================================================== ---- qtbase-opensource-src-5.8.0.orig/src/gui/kernel/qguiapplication.cpp -+++ qtbase-opensource-src-5.8.0/src/gui/kernel/qguiapplication.cpp -@@ -1217,6 +1217,10 @@ void QGuiApplicationPrivate::createPlatf - - // Load the platform integration - QString platformPluginPath = QString::fromLocal8Bit(qgetenv("QT_QPA_PLATFORM_PLUGIN_PATH")); -+ if (!platformPluginPath.isEmpty()) { -+ platformPluginPath.append(QStringLiteral(":")); -+ } -+ platformPluginPath.append(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH)); - - - QByteArray platformName; diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series index 6f6942b4444..47400cf7aa3 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series @@ -4,7 +4,7 @@ dlopen-libXcursor.patch xdg-config-dirs.patch nix-profiles-library-paths.patch libressl.patch -qpa-plugin-path.patch +qpa-platform-plugin-path.patch dlopen-gl.patch compose-search-path.patch cmake-paths.patch -- cgit 1.4.1 From 03d190d54f63eda9ae37fc350517957a596b9cb7 Mon Sep 17 00:00:00 2001 From: J M Date: Tue, 16 May 2017 05:11:55 -0400 Subject: shibboleth: Add Myself as a Maintainer (#25817) --- lib/maintainers.nix | 1 + nixos/modules/services/security/shibboleth-sp.nix | 2 ++ pkgs/development/libraries/log4shib/default.nix | 3 ++- pkgs/development/libraries/opensaml-cpp/default.nix | 1 + pkgs/development/libraries/shibboleth-sp/default.nix | 1 + pkgs/development/libraries/xml-tooling-c/default.nix | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e8c1b364919..af91ea5be24 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -227,6 +227,7 @@ ivan-tkatchev = "Ivan Tkatchev "; j-keck = "Jürgen Keck "; jagajaga = "Arseniy Seroka "; + jammerful = "jammerful "; jansol = "Jan Solanti "; javaguirre = "Javier Aguirre "; jb55 = "William Casarin "; diff --git a/nixos/modules/services/security/shibboleth-sp.nix b/nixos/modules/services/security/shibboleth-sp.nix index 07acf27f0f6..5908f727d53 100644 --- a/nixos/modules/services/security/shibboleth-sp.nix +++ b/nixos/modules/services/security/shibboleth-sp.nix @@ -70,4 +70,6 @@ in { }; }; }; + + meta.maintainers = with lib.maintainers; [ jammerful ]; } diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index f9b68e1a0cf..7b672aebe44 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = { + meta = with stdenv.lib; { description = "A forked version of log4cpp that has been created for the Shibboleth project"; + maintainers = [ maintainers.jammerful ]; }; } diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 9e3fbd15306..c2c102ccf9b 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "A low-level library written in C++ that provides support for producing and consuming SAML messages"; platforms = platforms.unix; license = licenses.asl20; + maintainers = [ maintainers.jammerful ]; }; } diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index de6d6544c13..f15c72498b2 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "Enables SSO and Federation web applications written with any programming language or framework"; platforms = platforms.unix; license = licenses.asl20; + maintainers = [ maintainers.jammerful ]; }; } diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index 139a4c8cccd..f2d7711c9f0 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2"; platforms = platforms.unix; license = licenses.asl20; + maintainers = [ maintainers.jammerful ]; }; } -- cgit 1.4.1