diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix index a358bff25d1b..7b85e8c198e3 100644 --- a/pkgs/desktops/kde-4.8/default.nix +++ b/pkgs/desktops/kde-4.8/default.nix @@ -10,6 +10,8 @@ let # The list of igored individual modules ignoreList = { + # Doesn't work yet + kdeutils = [ "ksecrets" ]; # kdeadmin/strigi-analyzer has no real code kdeadmin = [ "strigi-analyzer" ]; # kdesdk/kioslave is splitted into kioslave-svn and kioslave-git diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix index 1cec814b81e1..4fadc9edf000 100644 --- a/pkgs/desktops/kde-4.8/kde-wallpapers.nix +++ b/pkgs/desktops/kde-4.8/kde-wallpapers.nix @@ -9,7 +9,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "326b19180e1a03c9fbf5e99f1a3ee6d4dfd0bd6fde5c0ef4b7a5608b20e75a5f"; + outputHash = "69cbb2e8c6fd78931af7196c3a79918f87b5aed31c52521b8d4089eb98e7557b"; meta = { description = "Wallpapers for KDE"; diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch b/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch deleted file mode 100644 index 24a68e114406..000000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/ksecrets/CMakeLists.txt b/ksecrets/CMakeLists.txt -index 040b55f..a1e04c3 100644 ---- a/ksecrets/CMakeLists.txt -+++ b/ksecrets/CMakeLists.txt -@@ -5,7 +5,6 @@ PROJECT (ksecrets) - - include(MacroLibrary) - include(KDE4Defaults) --include(PkgConfigGetVar) - - INCLUDE_DIRECTORIES ( - ${KDE4_INCLUDES} -diff --git a/ksecretsserviced/CMakeLists.txt b/ksecretsserviced/CMakeLists.txt -index d2feb41..339225b 100644 ---- a/ksecretsserviced/CMakeLists.txt -+++ b/ksecretsserviced/CMakeLists.txt -@@ -2,7 +2,6 @@ PROJECT (ksecretsserviced) - - include(MacroLibrary) - include(KDE4Defaults) --include(PkgConfigGetVar) - - INCLUDE_DIRECTORIES ( - ${KDE4_INCLUDES} -@@ -38,4 +37,5 @@ TARGET_LINK_LIBRARIES (ksecretsserviced - - install( TARGETS ksecretsserviced ${INSTALL_TARGETS_DEFAULT_ARGS}) - install( FILES ksecretsserviced.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) --dbus_add_activation_service(org.kde.ksecretsserviced.service.in) -+configure_file(org.kde.ksecretsserviced.service.in org.kde.ksecretsserviced.service) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ksecretsserviced.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR} ) -diff --git a/kwl2kss/CMakeLists.txt b/kwl2kss/CMakeLists.txt -index 41d8ec0..4cedb0e 100644 ---- a/kwl2kss/CMakeLists.txt -+++ b/kwl2kss/CMakeLists.txt -@@ -3,7 +3,6 @@ project(kwl2kss) - - include(MacroLibrary) - include(KDE4Defaults) --include(PkgConfigGetVar) - - ########### Configure checks for kwalletbackend ############### - diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix b/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix deleted file mode 100644 index da9b7f0861cd..000000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, qca2 }: - -kde { - buildInputs = [ kdelibs qca2 ]; - - patches = [ ./ksecrets-ftbfs.patch ]; - - meta = { - description = "KDE implementation of SecretsService"; - }; -} diff --git a/pkgs/desktops/kde-4.8/oxygen-icons.nix b/pkgs/desktops/kde-4.8/oxygen-icons.nix index 7f02e1e90779..32af5be17991 100644 --- a/pkgs/desktops/kde-4.8/oxygen-icons.nix +++ b/pkgs/desktops/kde-4.8/oxygen-icons.nix @@ -3,7 +3,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "78f35ceba58bd34059ca4b2107bb55d4de56733e8932ba2ea22dcac18ee995ce"; + outputHash = "973f53b59e31e1e1dca41aa5abf0fc50e9cf0cbee57f156d90c2e754f33cc1b9"; buildNativeInputs = [ cmake ];