diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix index eab66add2b3b..c0eaa188e754 100644 --- a/pkgs/by-name/re/resources/package.nix +++ b/pkgs/by-name/re/resources/package.nix @@ -17,23 +17,24 @@ libadwaita, dmidecode, util-linux, + systemd, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "resources"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "nokyan"; repo = "resources"; tag = "v${finalAttrs.version}"; - hash = "sha256-z4ZVj/nS4n3oqENSK87YJ8sQRnqK7c4tWzKHUD0Qw2s="; + hash = "sha256-ayptMBniaqVQwLThxTbMn5498kURjwRkC9lVPs7pryo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-jHdEiK3nu9mN2A6biHq9Iu4bSniD74hGnKFBTt5xVDM="; + hash = "sha256-b6zWjSTkqdLaWRtMIHTLT0rEHlIxEKejYuoJkr4C3nY="; }; nativeBuildInputs = [ @@ -55,19 +56,21 @@ stdenv.mkDerivation (finalAttrs: { libadwaita ]; - postPatch = '' - substituteInPlace src/utils/memory.rs \ - --replace '"dmidecode"' '"${dmidecode}/bin/dmidecode"' - substituteInPlace src/utils/cpu.rs \ - --replace '"lscpu"' '"${util-linux}/bin/lscpu"' - substituteInPlace src/utils/memory.rs \ - --replace '"pkexec"' '"/run/wrappers/bin/pkexec"' - ''; + # Check all Command::new + runtimeDeps = [ + dmidecode + util-linux # lscpu + systemd # udevadm + ]; mesonFlags = [ (lib.mesonOption "profile" "default") ]; + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps}) + ''; + passthru = { updateScript = nix-update-script { }; };