cosmic-packages: bin-src -> cargo-target-dir (#447595)

This commit is contained in:
Alyssa Ross
2025-10-01 07:22:52 +00:00
committed by GitHub
15 changed files with 30 additions and 44 deletions
@@ -36,14 +36,10 @@ 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 = ''
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
'';
passthru = {
tests = {
inherit (nixosTests)
+2 -2
View File
@@ -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 = {
+2 -2
View File
@@ -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 = {
+2 -5
View File
@@ -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
+2 -5
View File
@@ -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 = ''
+2 -2
View File
@@ -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 = ''
+2 -2
View File
@@ -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";
@@ -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 = {
+2 -2
View File
@@ -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 = {
+2 -6
View File
@@ -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
@@ -64,8 +60,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 = ''
+2 -2
View File
@@ -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 = {
@@ -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 = {
+2 -2
View File
@@ -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 = ''
+2 -2
View File
@@ -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 = {
+2 -2
View File
@@ -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 = {