diff --git a/pkgs/applications/version-management/kdesvn/builder.sh b/pkgs/applications/version-management/kdesvn/builder.sh deleted file mode 100644 index ed3b06c00c8..00000000000 --- a/pkgs/applications/version-management/kdesvn/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|/usr|$subversion|g" src/svnqt/cmakemodules/FindSubversion.cmake -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 141bf938e3a..c063cd6d09a 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,15 +1,21 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4 -, kdelibs, automoc4, phonon}: +, kdelibs, automoc4, phonon, kdebase}: stdenv.mkDerivation { - name = "kdesvn-1.5.2"; + name = "kdesvn-1.5.5"; src = fetchurl { - url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.2.tar.bz2; - sha256 = "1svblxi70ks816zj1w4cc87x72b628g7xjx4hvx57zw8d9hr463h"; + url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.5.tar.bz2; + sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7"; }; - builder = ./builder.sh; - inherit subversion; + + patchPhase = '' + sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake + ''; + + makeFlags = [ "VERBOSE=1" ]; + buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ]; + meta = { description = "KDE SVN front-end"; license = "GPL";