diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-01 15:22:55 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-11-01 23:39:05 +0100 |
| commit | 94364575423c7be57ef63d0e477797433679c56b (patch) | |
| tree | c586c3a4bd056acd432b8a5f5c74f82ab2579b64 /pkgs/applications | |
| parent | c3d017eee3976e283874fbe614054dc8d78fabb6 (diff) | |
| download | nixpkgs-94364575423c7be57ef63d0e477797433679c56b.tar nixpkgs-94364575423c7be57ef63d0e477797433679c56b.tar.gz nixpkgs-94364575423c7be57ef63d0e477797433679c56b.tar.bz2 nixpkgs-94364575423c7be57ef63d0e477797433679c56b.tar.lz nixpkgs-94364575423c7be57ef63d0e477797433679c56b.tar.xz nixpkgs-94364575423c7be57ef63d0e477797433679c56b.tar.zst nixpkgs-94364575423c7be57ef63d0e477797433679c56b.zip | |
digikam: fix double wrapping
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 52de023e168..0654a2ed1a8 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -118,9 +118,12 @@ mkDerivation rec { "-DENABLE_QWEBENGINE=on" ]; + dontWrapGApps = true; + preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) - gappsWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname}) + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) + qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname}) substituteInPlace $out/bin/digitaglinktree \ --replace "/usr/bin/perl" "${perl}/bin/perl" \ --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" |