alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Added samba support to kde4-runtime

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10200
This commit is contained in:
Yury G. Kudryashov 2008-01-17 13:03:21 +00:00
parent ed035b3299
commit 2412e8364b
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/desktops/kde-4/runtime/default.nix
View file

@ -1,14 +1,16 @@
args: with args;
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "kdebase-runtime-4.0.0";
src = fetchurl {
url = mirror://kde/stable/4.0/src/kdebase-runtime-4.0.0.tar.bz2;
url = "mirror://kde/stable/4.0/src/${name}.tar.bz2";
sha256 = "0svsn9gzg3ka77j7z71fy502a09w9gp9jd2q2y1w07ahpdil5p7h";
};
propagatedBuildInputs = [kdepimlibs libusb xineLib];
patchPhase = "fixCmakeDbusCalls";
propagatedBuildInputs = [kdepimlibs libusb xineLib samba];
buildInputs = [cmake];
phononPatch = ./phonon.patch;
patchPhase = "fixCmakeDbusCalls; patch -p0 < ${phononPatch}";
}

13
pkgs/desktops/kde-4/runtime/phonon.patch Normal file
View file

@ -0,0 +1,13 @@
--- ../phonon/CMakeLists.txt 2007/12/27 15:43:14 753486
+++ ../phonon/CMakeLists.txt 2008/01/08 10:21:31 758568
@@ -34,7 +34,9 @@
macro_log_feature(TRUE "Xine" "xine-lib v${XINE_VERSION} was found on your system. This version is known to have problems when a device is unplugged. Consider upgrading to version 1.1.9 or above." "http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732")
endif(XINE_BUGFIX_VERSION LESS 5)
else(XINE_BUGFIX_VERSION LESS 7)
- macro_log_feature(TRUE "Xine" "xine-lib v${XINE_VERSION} was found on your system. This version is known to have problems when playing short sounds. Consider upgrading to version 1.1.9 or above." "http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732")
+ if(XINE_BUGFIX_VERSION LESS 9)
+ macro_log_feature(TRUE "Xine" "xine-lib v${XINE_VERSION} was found on your system. This version is known to have problems when playing short sounds. Consider upgrading to version 1.1.9 or above." "http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732")
+ endif(XINE_BUGFIX_VERSION LESS 9)
endif(XINE_BUGFIX_VERSION LESS 7)
else(XINE_MINOR_VERSION LESS 2 AND XINE_BUGFIX_VERSION LESS 90)
macro_log_feature(FALSE "Xine" "xine-lib v${XINE_VERSION} was found on your system. This version contains major changes compared to 1.1.x and has not been tested properly for use with this backend. Consider downgrading to version 1.1.9." "http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732")