Merge pull request #247957 from DCsunset/goldendict-ng-fix-glib

goldendict-ng: fix crash due to GLib error
This commit is contained in:
Nick Cao 2023-08-09 04:32:14 -06:00 committed by GitHub
commit 66eff9d0dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -26,6 +26,7 @@
, qtmultimedia
, qtspeech
, wrapQtAppsHook
, wrapGAppsHook
}:
stdenv.mkDerivation (finalAttrs: {
@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-ZKbrO5L4KFmr2NsGDihRWBeW0OXHoPRwZGj6kt1Anc8=";
};
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook ];
buildInputs = [
qtbase
qtsvg
@ -64,6 +65,13 @@ stdenv.mkDerivation (finalAttrs: {
libzim
];
# to prevent double wrapping of wrapQtApps and wrapGApps
dontWrapGApps = true;
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
cmakeFlags = [
"-DWITH_XAPIAN=ON"
"-DWITH_ZIM=ON"