diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:11:01 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:08:12 -0500 |
commit | 2e0589b4ca8f43dbce3e5af91c6e4375681ebee5 (patch) | |
tree | e2b3b4f6ec45ed280d298363f3a40eb2a510f789 /pkgs/tools/text/kdiff3 | |
parent | dd264938bc1df93a66f7647d9ace267a241a3da7 (diff) |
kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages' dependencies. On the Nixpkgs side, we no longer propagate the dependency on cmake (to reduce closure size), so downstream dependencies had to be adjusted for most packages that depend on kdelibs.
Diffstat (limited to 'pkgs/tools/text/kdiff3')
-rw-r--r-- | pkgs/tools/text/kdiff3/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index eb8db0a44a5f7..664fb87b5205b 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake, kdelibs, gettext }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, kdelibs, gettext +}: stdenv.mkDerivation rec { name = "kdiff3-0.9.98"; @@ -8,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ kdelibs ]; - nativeBuildInputs = [ cmake gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; meta = { homepage = http://kdiff3.sourceforge.net/; |