From d0a03f4c6892d857fc82935d2915568a21613b98 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 30 Oct 2022 04:19:12 +0100 Subject: [PATCH] xchm: migrate to wxGTK32 --- pkgs/applications/misc/xchm/default.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index 2d90a836446e..16c6bfac7ed0 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, wxGTK32 +, chmlib +}: stdenv.mkDerivation rec { pname = "xchm"; @@ -11,13 +17,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-8HQaXxZQwfBaWc22GivKri1vZEnZ23anSfriCvmLHHw="; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ wxGTK30 chmlib ]; + nativeBuildInputs = [ + autoreconfHook + ]; - configureFlags = [ "--with-wx-prefix=${wxGTK30}" ]; + buildInputs = [ + wxGTK32 + chmlib + ]; + + configureFlags = [ "--with-wx-prefix=${wxGTK32}" ]; preConfigure = '' - export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0" + export LDFLAGS="$LDFLAGS $(${wxGTK32}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk3u_aui-3.2" ''; meta = with lib; {