pop-launcher: prefer --replace-fail for substituteInPlace (#337457)

This commit is contained in:
Johannes Jöns 2024-08-28 19:33:34 +00:00 committed by GitHub
commit 8f8d949e95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 7 deletions

View File

@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec {
postPatch = '' postPatch = ''
substituteInPlace src/lib.rs \ substituteInPlace src/lib.rs \
--replace '/usr/lib/pop-launcher' "$out/share/pop-launcher" --replace-fail '/usr/lib/pop-launcher' "$out/share/pop-launcher"
substituteInPlace plugins/src/scripts/mod.rs \ substituteInPlace plugins/src/scripts/mod.rs \
--replace '/usr/lib/pop-launcher' "$out/share/pop-launcher" --replace-fail '/usr/lib/pop-launcher' "$out/share/pop-launcher"
substituteInPlace plugins/src/calc/mod.rs \ substituteInPlace plugins/src/calc/mod.rs \
--replace 'Command::new("qalc")' 'Command::new("${libqalculate}/bin/qalc")' --replace-fail 'Command::new("qalc")' 'Command::new("${libqalculate}/bin/qalc")'
substituteInPlace plugins/src/find/mod.rs \ substituteInPlace plugins/src/find/mod.rs \
--replace 'spawn("fd")' 'spawn("${fd}/bin/fd")' --replace-fail 'spawn("fd")' 'spawn("${fd}/bin/fd")'
substituteInPlace plugins/src/terminal/mod.rs \ substituteInPlace plugins/src/terminal/mod.rs \
--replace '/usr/bin/gnome-terminal' 'gnome-terminal' --replace-fail '/usr/bin/gnome-terminal' 'gnome-terminal'
''; '';
cargoHash = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok="; cargoHash = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok=";

View File

@ -32786,8 +32786,6 @@ with pkgs;
ponymix = callPackage ../applications/audio/ponymix { }; ponymix = callPackage ../applications/audio/ponymix { };
pop-launcher = callPackage ../applications/misc/pop-launcher { };
pothos = libsForQt5.callPackage ../applications/radio/pothos { }; pothos = libsForQt5.callPackage ../applications/radio/pothos { };
potrace = callPackage ../applications/graphics/potrace { }; potrace = callPackage ../applications/graphics/potrace { };