diff options
author | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2023-12-09 02:37:47 +0000 |
---|---|---|
committer | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-02-19 04:47:10 +0000 |
commit | 5e29e79f8b4316575988d1ad664278131a5ff6d9 (patch) | |
tree | ac4c77d53cd8a782dcd2aa762ba1f4ac677a8225 /pkgs/applications/search | |
parent | 2dfa764fba0be12de6f47f4a7bc2c07ceed78421 (diff) |
recoll: don't double wrap executables
Diffstat (limited to 'pkgs/applications/search')
-rw-r--r-- | pkgs/applications/search/recoll/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 8b1dd15b4aa66..99d4b79d1cc06 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -137,6 +137,10 @@ mkDerivation rec { libiconv ]; + qtWrapperArgs = [ + "--prefix PATH : ${filterPath}" + ]; + # the filters search through ${PATH} using a sh proc 'checkcmds' for the # filtering utils. Short circuit this by replacing the filtering command with # the absolute path to the filtering command. @@ -152,18 +156,19 @@ mkDerivation rec { substituteInPlace $f --replace /usr/bin/perl ${lib.getBin (perl.passthru.withPackages (p: [ p.ImageExifTool ]))}/bin/perl fi done - wrapProgram $out/bin/recollindex --prefix PATH : "${filterPath}" wrapProgram $out/share/recoll/filters/rclaudio.py \ --prefix PYTHONPATH : $PYTHONPATH wrapProgram $out/share/recoll/filters/rclimg \ --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}" '' + lib.optionalString stdenv.isLinux '' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' - wrapProgram $out/bin/recoll --prefix PATH : "${filterPath}" '' + lib.optionalString (stdenv.isDarwin && withGui) '' mkdir $out/Applications mv $out/bin/recoll.app $out/Applications - wrapProgram $out/Applications/recoll.app/Contents/MacOS/recoll --prefix PATH : "${filterPath}" + ''; + + # create symlink after fixup to prevent double wrapping of recoll + postFixup = lib.optionalString (stdenv.isDarwin && withGui) '' ln -s ../Applications/recoll.app/Contents/MacOS/recoll $out/bin/recoll ''; |