mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
Merge pull request #247957 from DCsunset/goldendict-ng-fix-glib
goldendict-ng: fix crash due to GLib error
This commit is contained in:
commit
66eff9d0dd
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user