Author: kkallio
Date: Sat Aug 6 18:01:56 2011
New Revision: 28197
URL: https://svn.nixos.org/websvn/nix/?rev=28197&sc=1
Log:
Remove kdebase as input to kdiff3.
Seems not to be needed and gives evaluation error when with kde4.7
Modified:
nixpkgs/trunk/pkgs/tools/text/kdiff3/default.nix
Modified: nixpkgs/trunk/pkgs/tools/text/kdiff3/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/text/kdiff3/default.nix Sat Aug 6 17:48:57
2011 (r28196)
+++ nixpkgs/trunk/pkgs/tools/text/kdiff3/default.nix Sat Aug 6 18:01:56
2011 (r28197)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, perl, kdelibs, kdebase, automoc4, phonon,
gettext}:
+{ stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, gettext}:
stdenv.mkDerivation rec {
name = "kdiff3-0.9.95";
@@ -8,7 +8,7 @@
};
# kdebase allows having a konqueror plugin built
- buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext kdebase ];
+ buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext ];
# Adjust the version of the DocBook XML to 4.2 ( so that it validates ).
patches = [ ./adjust-docbook-xml-version-to-4.2.patch ];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
