swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove ksecrets, fix outputHash

Browse source 
svn path=/nixpkgs/trunk/; revision=33622
This commit is contained in:
Yury G. Kudryashov 2012-04-05 13:50:47 +00:00
parent e1743e57be
commit 7aeb6ef2bb
5 changed files with 4 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/desktops/kde-4.8/default.nix
View file

@ -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

2
pkgs/desktops/kde-4.8/kde-wallpapers.nix
View file

@ -9,7 +9,7 @@ kde {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "326b19180e1a03c9fbf5e99f1a3ee6d4dfd0bd6fde5c0ef4b7a5608b20e75a5f";
outputHash = "69cbb2e8c6fd78931af7196c3a79918f87b5aed31c52521b8d4089eb98e7557b";
meta = {
description = "Wallpapers for KDE";

43
pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch
View file

@ -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 ###############

11
pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix
View file

@ -1,11 +0,0 @@
{ kde, kdelibs, qca2 }:
kde {
buildInputs = [ kdelibs qca2 ];
patches = [ ./ksecrets-ftbfs.patch ];
meta = {
description = "KDE implementation of SecretsService";
};
}

2
pkgs/desktops/kde-4.8/oxygen-icons.nix
View file

@ -3,7 +3,7 @@
kde {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "78f35ceba58bd34059ca4b2107bb55d4de56733e8932ba2ea22dcac18ee995ce";
outputHash = "973f53b59e31e1e1dca41aa5abf0fc50e9cf0cbee57f156d90c2e754f33cc1b9";
buildNativeInputs = [ cmake ];