diff options
| author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
|---|---|---|
| committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
| commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
| tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/applications/graphics/digikam/default.nix | |
| parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
| parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) | |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/graphics/digikam/default.nix')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/applications/graphics/digikam/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/digikam/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/digikam/default.nix index 52de023e1681..1e4b397db231 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/digikam/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/digikam/default.nix @@ -39,7 +39,7 @@ , marble , libGL , libGLU -, opencv3 +, opencv , pcre , threadweaver , x265 @@ -83,7 +83,7 @@ mkDerivation rec { libusb1 libGL libGLU - opencv3 + opencv pcre x265 @@ -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" |