From bdc57436da855500d44e9c1ce7450c0772e1cfa1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 9 Feb 2024 10:28:02 +0100 Subject: [PATCH] kdiff3: fix build --- pkgs/tools/text/kdiff3/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 5afca943d26a..f9f55bc28851 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,9 +1,9 @@ -{ mkDerivation +{ stdenv , lib , fetchurl , extra-cmake-modules , kdoctools -, wrapGAppsHook +, wrapQtAppsHook , boost , kcrash , kconfig @@ -12,20 +12,18 @@ , kiconthemes }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kdiff3"; version = "1.10.7"; src = fetchurl { - url = "mirror://kde/stable/kdiff3/kdiff3-${version}.tar.xz"; - hash = "sha256-/otpnRJM1NJjKzwnqgas7Fyqj8v4t2SM8MANektqzlA="; + url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; + hash = "sha256-uj9Ky/SsdIrr78hfWcr2U9Rf6FmkjDSviZGCJKdnxeM="; }; - buildInputs = [ boost ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - - propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ]; + buildInputs = [ boost kconfig kcrash kinit kparts kiconthemes ]; cmakeFlags = [ "-Wno-dev" ]; @@ -36,4 +34,4 @@ mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; -} +})