diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix index 38fe82ffb01..9b3f443ba38 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix @@ -1,14 +1,27 @@ -{ mkXfceDerivation, autoreconfHook, autoconf, automake -, glib, gtk-doc, intltool, libtool }: +{ mkXfceDerivation +, autoreconfHook +, libxslt +, docbook_xsl +, autoconf +, automake +, glib +, gtk-doc +, intltool +, libtool +}: mkXfceDerivation { category = "xfce"; pname = "xfce4-dev-tools"; - version = "4.14.0"; + version = "4.16.0"; - sha256 = "10hcj88784faqrk08xb538355cla26vdk9ckx158hqdqv38sb42f"; + sha256 = "0w47npi1np9vb7lhzjr680aa1xb8ch6kcbg0l0bqnpm0y0jmvgz6"; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + libxslt + docbook_xsl + ]; propagatedBuildInputs = [ autoconf @@ -19,11 +32,6 @@ mkXfceDerivation { libtool ]; - preAutoreconf = '' - substitute configure.ac.in configure.ac \ - --subst-var-by REVISION UNKNOWN - ''; - setupHook = ./setup-hook.sh; meta = { diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh index 600bf47fd87..3abf3172ea6 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh @@ -1,5 +1,5 @@ xdtEnvHook() { - addToSearchPath ACLOCAL_PATH $1/share/xfce4/dev-tools/m4macros + addToSearchPath ACLOCAL_PATH $1/share/aclocal } envHooks+=(xdtEnvHook)