From cb504bdf7e4c23bfcda2021c3c6873596d160426 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Mon, 26 Aug 2024 13:54:30 +0200 Subject: [PATCH 1/2] pop-launcher: prefer --replace-fail for substituteInPlace --- pkgs/applications/misc/pop-launcher/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/pop-launcher/default.nix b/pkgs/applications/misc/pop-launcher/default.nix index b8e614485a29..4f2a6e382fd3 100644 --- a/pkgs/applications/misc/pop-launcher/default.nix +++ b/pkgs/applications/misc/pop-launcher/default.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { postPatch = '' 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 \ - --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 \ - --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 \ - --replace 'spawn("fd")' 'spawn("${fd}/bin/fd")' + --replace-fail 'spawn("fd")' 'spawn("${fd}/bin/fd")' 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="; From 91122d6d31f8a61b02e3a68e0ea38887ee8fc61a Mon Sep 17 00:00:00 2001 From: a-kenji Date: Mon, 26 Aug 2024 13:57:09 +0200 Subject: [PATCH 2/2] pop-launcher: migrate to by-name --- .../default.nix => by-name/po/pop-launcher/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/pop-launcher/default.nix => by-name/po/pop-launcher/package.nix} (100%) diff --git a/pkgs/applications/misc/pop-launcher/default.nix b/pkgs/by-name/po/pop-launcher/package.nix similarity index 100% rename from pkgs/applications/misc/pop-launcher/default.nix rename to pkgs/by-name/po/pop-launcher/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48668cc069c9..0a755054032a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32809,8 +32809,6 @@ with pkgs; ponymix = callPackage ../applications/audio/ponymix { }; - pop-launcher = callPackage ../applications/misc/pop-launcher { }; - pothos = libsForQt5.callPackage ../applications/radio/pothos { }; potrace = callPackage ../applications/graphics/potrace { };