Author: urkud
Date: Wed Feb 22 14:51:15 2012
New Revision: 32473
URL: https://nixos.org/websvn/nix/?rev=32473&sc=1
Log:
Let hydra build kdesvn and krusader.
Also fix kdesvn build with qt-4.8.
Added:
nixpkgs/trunk/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch
Modified:
nixpkgs/trunk/pkgs/applications/misc/krusader/default.nix
nixpkgs/trunk/pkgs/applications/version-management/kdesvn/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/krusader/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/krusader/default.nix Wed Feb 22
12:12:00 2012 (r32472)
+++ nixpkgs/trunk/pkgs/applications/misc/krusader/default.nix Wed Feb 22
14:51:15 2012 (r32473)
@@ -12,5 +12,6 @@
license = "GPL";
homepage = http://www.krusader.org;
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+ inherit (kdelibs.meta) platforms;
};
}
Modified: nixpkgs/trunk/pkgs/applications/version-management/kdesvn/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/version-management/kdesvn/default.nix
Wed Feb 22 12:12:00 2012 (r32472)
+++ nixpkgs/trunk/pkgs/applications/version-management/kdesvn/default.nix
Wed Feb 22 14:51:15 2012 (r32473)
@@ -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 @@
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;
};
}
Added:
nixpkgs/trunk/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch
Wed Feb 22 14:51:15 2012 (r32473)
@@ -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 <[email protected]>
+ */
+-class RevGraphView : virtual public QGraphicsView
++class RevGraphView : public QGraphicsView
+ {
+ Q_OBJECT
+ public:
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
