From 07774208507ad34ad8b279006c5b7227afd0db95 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 22 Mar 2015 13:10:24 -0500 Subject: [PATCH 1/2] kf57: don't set obsolete KDE_DEFAULT_HOME --- pkgs/development/libraries/kde-frameworks-5.7/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index 793f1e9111d1..b2d59246bc25 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -27,10 +27,7 @@ let enableParallelBuilding = drv.enableParallelBuilding or true; cmakeFlags = (drv.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" - "-DKDE_DEFAULT_HOME=.kde5" - "-DKDE4_DEFAULT_HOME=.kde" - ] + ++ [ "-DBUILD_TESTING=OFF" ] ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; meta = From b4352e73df9551add3a20fe20e16ea0eb65edf88 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 22 Mar 2015 13:10:57 -0500 Subject: [PATCH 2/2] kdeApps.kdelibs: set KDE_DEFAULT_HOME=.kde --- pkgs/applications/kde-apps-14.12/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix index b34418401a0a..00f84896a0bf 100644 --- a/pkgs/applications/kde-apps-14.12/default.nix +++ b/pkgs/applications/kde-apps-14.12/default.nix @@ -241,6 +241,7 @@ let "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" "-DHUPNP_ENABLED=ON" "-DWITH_SOLID_UDISKS2=ON" + "-DKDE_DEFAULT_HOME=.kde" ]; };