diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix b/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix index 983b61b9317c..eacea109cf20 100644 --- a/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix +++ b/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix @@ -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" |