qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove uses of deprecated Rust functions

Browse Source 
speakersafetyd was using the wrong one, so I've fixed it while I was
here.
This commit is contained in:
Alyssa Ross 2024-09-02 19:46:45 +02:00
parent 99d58d3d2b
commit f48ddf4ba9
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/element/seshat/default.nix
View File

@ -36,7 +36,7 @@ in rustPlatform.buildRustPackage rec {
fixup-yarn-lock yarn.lock
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules/
node_modules/.bin/neon build --release -- --target ${rust.toRustTargetSpec stdenv.hostPlatform} -Z unstable-options --out-dir target/release
node_modules/.bin/neon build --release -- --target ${stdenv.hostPlatform.rust.rustcTarget} -Z unstable-options --out-dir target/release
runHook postBuild
'';

4
pkgs/by-name/co/cosmic-greeter/package.nix
View File

@ -60,10 +60,10 @@ rustPlatform.buildRustPackage rec {
(placeholder "out")
"--set"
"bin-src"
"target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-greeter"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-greeter"
"--set"
"daemon-src"
"target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-greeter-daemon"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-greeter-daemon"
];
postPatch = ''

2
pkgs/by-name/co/cosmic-session/package.nix
View File

@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
postPatch = ''
substituteInPlace Justfile \
--replace-fail '{{cargo-target-dir}}/release/cosmic-session' 'target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-session'
--replace-fail '{{cargo-target-dir}}/release/cosmic-session' 'target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-session'
substituteInPlace data/start-cosmic \
--replace-fail '/usr/bin/cosmic-session' "${placeholder "out"}/bin/cosmic-session" \
--replace-fail '/usr/bin/dbus-run-session' "${lib.getBin dbus}/bin/dbus-run-session"

2
pkgs/by-name/sp/speakersafetyd/package.nix
View File

@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
postPatch = ''
substituteInPlace speakersafetyd.service --replace "/usr" "$out"
substituteInPlace Makefile --replace "target/release" "target/${rust.lib.toRustTargetSpec stdenv.hostPlatform}/$cargoBuildType"
substituteInPlace Makefile --replace "target/release" "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType"
# creating files in /var does not make sense in a nix package
substituteInPlace Makefile --replace 'install -dDm0755 $(DESTDIR)/$(VARDIR)/lib/speakersafetyd/blackbox' ""
'';

2
pkgs/development/tools/devpod/default.nix
View File

@ -96,7 +96,7 @@ rec {
dontInstall = true;
};
rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform;
rustTargetPlatformSpec = stdenv.hostPlatform.rust.rustcTarget;
in
rustPlatform.buildRustPackage {
inherit version src;