From 754f5fb90dbc5b6bcfdc15e7b46cb8ac943a1ea0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 27 Nov 2024 23:06:33 -0500 Subject: [PATCH] zram-generator: format with nixfmt, use --replace-fail instead of --replace --- pkgs/by-name/zr/zram-generator/package.nix | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/zr/zram-generator/package.nix b/pkgs/by-name/zr/zram-generator/package.nix index c8be4c66a330..d92690792bba 100644 --- a/pkgs/by-name/zr/zram-generator/package.nix +++ b/pkgs/by-name/zr/zram-generator/package.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, pkg-config -, bash -, ronn -, systemd -, kmod -, nixosTests +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + bash, + ronn, + systemd, + kmod, + nixosTests, }: rustPlatform.buildRustPackage rec { @@ -28,10 +29,10 @@ rustPlatform.buildRustPackage rec { postPatch = '' cp ${./Cargo.lock} Cargo.lock substituteInPlace Makefile \ - --replace 'target/$(BUILDTYPE)' 'target/${stdenv.hostPlatform.rust.rustcTargetSpec}/$(BUILDTYPE)' + --replace-fail 'target/$(BUILDTYPE)' 'target/${stdenv.hostPlatform.rust.rustcTargetSpec}/$(BUILDTYPE)' substituteInPlace src/generator.rs \ - --replace 'Command::new("systemd-detect-virt")' 'Command::new("${systemd}/bin/systemd-detect-virt")' \ - --replace 'Command::new("modprobe")' 'Command::new("${kmod}/bin/modprobe")' + --replace-fail 'Command::new("systemd-detect-virt")' 'Command::new("${systemd}/bin/systemd-detect-virt")' \ + --replace-fail 'Command::new("modprobe")' 'Command::new("${kmod}/bin/modprobe")' substituteInPlace src/config.rs \ --replace-fail 'Command::new("/bin/sh")' 'Command::new("${bash}/bin/sh")' '';