diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix index 6dc5ac795f7..7b444690e40 100644 --- a/pkgs/desktops/kde-4.2/default.nix +++ b/pkgs/desktops/kde-4.2/default.nix @@ -185,6 +185,12 @@ rec { inherit automoc4 phonon strigi soprano; }; + kdesvn = import ./extragear/kdesvn { + inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext apr aprutil subversion db4; + inherit kdelibs; + inherit automoc4 phonon; + }; + ktorrent = import ./extragear/ktorrent { inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp taglib boost gettext; inherit kdelibs kdepimlibs kdebase_workspace; diff --git a/pkgs/desktops/kde-4.2/extragear/kdesvn/builder.sh b/pkgs/desktops/kde-4.2/extragear/kdesvn/builder.sh new file mode 100644 index 00000000000..ed3b06c00c8 --- /dev/null +++ b/pkgs/desktops/kde-4.2/extragear/kdesvn/builder.sh @@ -0,0 +1,8 @@ +source $stdenv/setup + +myPatchPhase() +{ + sed -i -e "s|/usr|$subversion|g" src/svnqt/cmakemodules/FindSubversion.cmake +} +patchPhase=myPatchPhase +genericBuild diff --git a/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix b/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix new file mode 100644 index 00000000000..407b84f9989 --- /dev/null +++ b/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4, + kdelibs, automoc4, phonon}: + +stdenv.mkDerivation { + name = "kdesvn-1.2.4"; + src = fetchurl { + url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.2.4.tar.bz2; + sha256 = "aa81addf5f86b4c59026debc555d7aac783002331942847c32d2feb277a81620"; + }; + builder = ./builder.sh; + inherit subversion; + buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ]; +} diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index c71c853eec3..34c31f56942 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -350,6 +350,7 @@ in { kdeutils = linux; kdewebdev = linux; ktorrent = linux; + kdesvn = linux; }; kernelPackages_2_6_26 = {