From 7877b8b95e1af26a45c63fdf91de7f17fad71bc6 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:18:17 -0300
Subject: [PATCH 01/17] cosmic-applibrary: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-applibrary/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index 9d6bcc14f575..50b5681da369 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -36,8 +36,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-app-library"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   postPatch = ''

From bc7f07b59046c1ec4e839a17958e8b015fb073bf Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:27:37 -0300
Subject: [PATCH 02/17] cosmic-applibrary: remove unnecessary patch

This patch currently does nothing, so we can remove it
---
 pkgs/by-name/co/cosmic-applibrary/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index 50b5681da369..2f60f0f352b0 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -40,10 +40,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
-  postPatch = ''
-    substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
-  '';
-
   passthru = {
     tests = {
       inherit (nixosTests)

From b0cf080f74491bdef113d10bf820dce75baf61a7 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:22:33 -0300
Subject: [PATCH 03/17] cosmic-bg: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-bg/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index db22e05c964e..719f4650bde2 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -45,8 +45,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-bg"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   passthru = {

From 25b335a4305fd2350941b1595c2bad312709e603 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:38:26 -0300
Subject: [PATCH 04/17] cosmic-edit: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-edit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index 1b8e42fab2e0..c861f9a5ead8 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -53,8 +53,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-edit"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   passthru = {

From bfb9e3ee6cbe7e13aa2b94f3c6eb56a8aaba05f8 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:41:27 -0300
Subject: [PATCH 05/17] cosmic-files: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-files/package.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index ba97add394a1..f931d3df52e6 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -40,11 +40,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-files"
-    "--set"
-    "applet-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-files-applet"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   # This is needed since by setting cargoBuildFlags, it would build both the applet and the main binary

From 126826a0638e54a1245a4c6a6ec0ceb6c8b2d36a Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:42:23 -0300
Subject: [PATCH 06/17] cosmic-greeter: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-greeter/package.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index 5c8a30e81af9..a66a3ac5a144 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -57,11 +57,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-greeter"
-    "--set"
-    "daemon-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-greeter-daemon"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   postPatch = ''

From 1536ce175975553aee14733c21fc04187976fd55 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:44:39 -0300
Subject: [PATCH 07/17] cosmic-idle: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-idle/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix
index ce660c1ad14d..9847ce7966f0 100644
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -41,8 +41,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-idle"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   postPatch = ''

From c6d3b8a0c7e8c656050c99e9b3cc2496bff3534f Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:46:01 -0300
Subject: [PATCH 08/17] cosmic-launcher: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-launcher/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index 6595b2bd6595..f2617f151cc7 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -36,8 +36,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-launcher"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable";

From 74f3d97d54fa4c976d08617a768298c03cdf2542 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:47:27 -0300
Subject: [PATCH 09/17] cosmic-notifications: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-notifications/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index 470359ee8e12..9ff3f7ac8299 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -39,8 +39,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-notifications"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   passthru = {

From 8b35a5e393bb73983ef5091a1e393f92642cd3e0 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:54:06 -0300
Subject: [PATCH 10/17] cosmic-panel: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-panel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix
index 1f9ad5881177..ff40a8512385 100644
--- a/pkgs/by-name/co/cosmic-panel/package.nix
+++ b/pkgs/by-name/co/cosmic-panel/package.nix
@@ -36,8 +36,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   passthru = {

From 888a2e75b127f0eb3e745dfb0855940a7d0f5683 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:56:58 -0300
Subject: [PATCH 11/17] cosmic-player: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-player/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index 5cd04cc15067..4d6c54988d6a 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -64,8 +64,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-player"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   postInstall = ''

From ef28795fe5918fd5270fc6ee2c5e491bde21200f Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:57:19 -0300
Subject: [PATCH 12/17] cosmic-player: remove unneeded patch

It doesn't do anything, so removed it
---
 pkgs/by-name/co/cosmic-player/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index 4d6c54988d6a..a213b228531a 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -30,10 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-DodFIfthiGFSvXWfPsPjFhNY6G7z3lb6pfc5HtUXhMo=";
 
-  postPatch = ''
-    substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
-  '';
-
   nativeBuildInputs = [
     just
     pkg-config

From c0780d221c27ea0c486794b2bc30b3a0b007b6ee Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:59:00 -0300
Subject: [PATCH 13/17] cosmic-randr: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-randr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index c1885e1fc39c..95f1be48c2fc 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -39,8 +39,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-randr"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   passthru = {

From 8d9674d3c296a6bb1c6c5ef1514c56162f058fd5 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 19:00:07 -0300
Subject: [PATCH 14/17] cosmic-screenshot: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-screenshot/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix
index 43052df88163..19e6b35a9007 100644
--- a/pkgs/by-name/co/cosmic-screenshot/package.nix
+++ b/pkgs/by-name/co/cosmic-screenshot/package.nix
@@ -34,8 +34,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-screenshot"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   passthru.tests = {

From 71791a8d407b37793549dd0e2a52dc80d3834874 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 19:03:13 -0300
Subject: [PATCH 15/17] cosmic-settings: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-settings/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index fcc20c1b18ee..31c4217cca33 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -66,8 +66,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   preFixup = ''

From a73b39c50422c8e4a58617b7115944ec0001f2ac Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 19:03:58 -0300
Subject: [PATCH 16/17] cosmic-store: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-store/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index 96b3f223db9a..234b522ceb37 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -47,8 +47,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-store"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   passthru = {

From 17e3bb62c97a78598a9f318e37ca4d9f48def776 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 30 Sep 2025 19:04:55 -0300
Subject: [PATCH 17/17] cosmic-term: `bin-src` -> `cargo-target-dir`

Avoids hardcoding the path to the binary, making
the packaging more robust.
---
 pkgs/by-name/co/cosmic-term/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index 390b2a7bab0a..cbd95303c28d 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -47,8 +47,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "prefix"
     (placeholder "out")
     "--set"
-    "bin-src"
-    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-term"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
   passthru = {