diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-22 14:51:15 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-22 14:51:15 +0000 |
| commit | c6f0449124cf025203af93bd5ddd081275752c82 (patch) | |
| tree | 2a38e7cd128bc4144a7ffc95cd5b31404379ad6e | |
| parent | 77a8ea6fbd474bca969371506ee663e1517a5905 (diff) | |
| download | nixpkgs-c6f0449124cf025203af93bd5ddd081275752c82.tar nixpkgs-c6f0449124cf025203af93bd5ddd081275752c82.tar.gz nixpkgs-c6f0449124cf025203af93bd5ddd081275752c82.tar.bz2 nixpkgs-c6f0449124cf025203af93bd5ddd081275752c82.tar.lz nixpkgs-c6f0449124cf025203af93bd5ddd081275752c82.tar.xz nixpkgs-c6f0449124cf025203af93bd5ddd081275752c82.tar.zst nixpkgs-c6f0449124cf025203af93bd5ddd081275752c82.zip | |
Let hydra build kdesvn and krusader.
Also fix kdesvn build with qt-4.8. svn path=/nixpkgs/trunk/; revision=32473
3 files changed, 22 insertions, 7 deletions
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 05e62ba3844..bd86501c30e 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { license = "GPL"; homepage = http://www.krusader.org; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + inherit (kdelibs.meta) platforms; }; } diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 10a590e941b..7761c45850e 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4 -, kdelibs, automoc4, phonon, kde_baseapps }: +{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "kdesvn-1.5.5"; + src = fetchurl { - url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.5.tar.bz2; + url = "${meta.homepage}/downloads/${name}.tar.bz2"; sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7"; }; @@ -12,15 +12,18 @@ stdenv.mkDerivation { sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake ''; - patches = [ ./docbook.patch ]; + patches = [ ./docbook.patch ./virtual_inheritance.patch ]; - buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ]; + buildInputs = [ apr aprutil subversion db4 kdelibs ]; + + buildNativeInputs = [ gettext ]; meta = { description = "KDE SVN front-end"; license = "GPL"; homepage = http://kdesvn.alwins-world.de; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ stdenv.lib.maintainers.sander ]; + inherit (kdelibs.meta) platforms; }; } diff --git a/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch b/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch new file mode 100644 index 00000000000..faaf6afcd6b --- /dev/null +++ b/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch @@ -0,0 +1,11 @@ +--- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h ++++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h +@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil + /** + @author Rajko Albrecht <ral@alwins-world.de> + */ +-class RevGraphView : virtual public QGraphicsView ++class RevGraphView : public QGraphicsView + { + Q_OBJECT + public: |