Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e881d0c52791
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6b5edcb71f81
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 9, 2020

  1. kdeFrameworks: 5.64.0 -> 5.65.0

    @dtzWill
    dtzWill committed Jan 9, 2020
    Copy the full SHA
    751a7fa View commit details

  2. kdeFrameworks.extra-cmake-modules: fix patch 

    (cherry picked from commit 63fffe7)
    @dtzWill
    dtzWill committed Jan 9, 2020
    Copy the full SHA
    ed3ac21 View commit details

  3. kinit: fixup patch

    @dtzWill
    dtzWill committed Jan 9, 2020
    Copy the full SHA
    2c11c6f View commit details

Commits on Jan 16, 2020

  1. Merge pull request #77352 from dtzWill/update/kdeframeworks-5.65 

    kdeFrameworks: 5.64.0 -> 5.65.0
    @ttuegel
    ttuegel authored Jan 16, 2020
    Copy the full SHA
    6b5edcb View commit details
6 changes: 3 additions & 3 deletions pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index 0acd33f..c04b0a5 100644
index c1d056b..d9e19f0 100644
--- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake
@@ -236,35 +236,6 @@
@@ -242,35 +242,6 @@
# GNUInstallDirs code deals with re-configuring, but that is dealt with
# by the _define_* macros in this module).
set(_LIBDIR_DEFAULT "lib")
-# Override this default 'lib' with 'lib64' iff:
-# Override this default 'lib' with 'lib64' if:
-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
-# - we are NOT on debian
-# - we are NOT on flatpak
2 changes: 1 addition & 1 deletion pkgs/development/libraries/kde-frameworks/fetch.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.64/ )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.65/ )
7 changes: 3 additions & 4 deletions pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
View file
Original file line number Diff line number Diff line change
@@ -38,10 +38,9 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp
static void secondary_child_handler(int)
@@ -1692,7 +1676,7 @@ int main(int argc, char **argv)
if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) {
const int extrasCount = sizeof(extra_libs) / sizeof(extra_libs[0]);
for (int i = 0; i < extrasCount; i++) {
- const QString extra = findSharedLib(QString::fromLatin1(extra_libs[i]));
+ const QString extra = QString::fromLatin1(extra_libs[i]);
for (const char *extra_lib : extra_libs) {
- const QString extra = findSharedLib(QString::fromLatin1(extra_lib));
+ const QString extra = QString::fromLatin1(extra_lib);
if (!extra.isEmpty()) {
QLibrary l(extra);
l.setLoadHints(QLibrary::ExportExternalSymbolsHint);
Loading