mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00
Code Issues Wiki Activity

Fix kdenetwork

Browse source
This commit is contained in:
Eelco Dolstra 2013-07-17 14:54:47 +02:00
parent dfd621745a
commit 66021f9cd8
8 changed files with 7 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix
View file

@ -2,6 +2,4 @@
kde {
buildInputs = [ kdelibs ];
patches = [ ./kdenetwork.patch ];
}

4
pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
View file

@ -5,7 +5,5 @@ kde {
buildInputs = [ kdelibs boost ];
preConfigure = "mv -v strigi-analyzer kfile-plugins";
patches = [ ./kdenetwork.patch ];
#preConfigure = "mv -v kdenetwork-strigi-analyzers kfile-plugins";
}

24
pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch
View file

@ -1,24 +0,0 @@
diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt
--- kdenetwork-4.7.1.orig/CMakeLists.txt 2011-03-29 15:25:42.174521812 +0400
+++ kdenetwork-4.7.1/CMakeLists.txt 2011-03-29 15:27:43.268140322 +0400
@@ -28,7 +28,8 @@
set(CMAKE_REQUIRED_INCLUDES ${KDEWIN_INCLUDES} )
endif (WIN32)
-find_package(KdepimLibs REQUIRED)
+macro_optional_find_package(KdepimLibs)
+macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete")
# find_package(X11VidMode) not used at this time
# NX support is not ready for KDE 4.2; disabled (uwolfer)
@@ -79,7 +80,9 @@
macro_optional_add_subdirectory(kfile-plugins)
macro_optional_add_subdirectory(kget)
-macro_optional_add_subdirectory(kopete)
+if(KDEPIMLIBS_FOUND)
+ macro_optional_add_subdirectory(kopete)
+endif(KDEPIMLIBS_FOUND)
if(Q_WS_X11)
macro_optional_add_subdirectory(krdc)

2
pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix
View file

@ -2,6 +2,4 @@
kde {
buildInputs = [ kdelibs ];
patches = [ ./kdenetwork.patch ];
}

11
pkgs/desktops/kde-4.10/kdenetwork/kget.nix
View file

@ -4,14 +4,11 @@
kde {
buildInputs =
[ kdelibs libktorrent
#kde_workspace
shared_desktop_ontologies
#kdepimlibs
# kde_baseapps
gpgme boost libmms qca2 sqlite
kde_workspace
shared_desktop_ontologies
# kde_baseapps
gpgme boost libmms qca2 sqlite
];
KDEDIRS = libktorrent;
patches = [ ./kdenetwork.patch ];
}

2
pkgs/desktops/kde-4.10/kdenetwork/kppp.nix
View file

@ -2,6 +2,4 @@
kde {
buildInputs = [ kdelibs ];
patches = [ ./kdenetwork.patch ];
}

3
pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
View file

@ -1,8 +1,5 @@
{ kde, kdelibs, libvncserver, libjpeg }:
kde {
buildInputs = [ kdelibs libvncserver libjpeg ];
patches = [ ./kdenetwork.patch ];
}

6
pkgs/desktops/kde-4.10/kdenetwork/krfb.nix
View file

@ -1,7 +1,5 @@
{ kde, kdelibs, libvncserver, libXdamage, libXtst }:
{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg }:
kde {
buildInputs = [ kdelibs libvncserver libXdamage libXtst];
patches = [ ./kdenetwork.patch ];
buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg ];
}