Merge pull request #310507 from PhDyellow/ryzen_monitor_fix

ryzen-monitor-ng: excise (obsolete) binaries from upstream source

authored by

Masum Reza and committed by
GitHub
819ed068 229d6724

+18 -18
+18 -18
pkgs/by-name/ry/ryzen-monitor-ng/package.nix
··· 1 - { lib, stdenv, fetchFromGitHub }: 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitHub, 5 + unstableGitUpdater, 6 + }: 2 7 3 8 stdenv.mkDerivation { 4 9 pname = "ryzen-monitor-ng"; ··· 11 16 owner = "plasmin"; 12 17 repo = "ryzen_monitor_ng"; 13 18 rev = "8b7854791d78de731a45ce7d30dd17983228b7b1"; 14 - hash = "sha256-fcW2fEsCFliRnMFnboR0jchzVIlCYbr2AE6AS06cb6o="; 19 + hash = "sha256-xdYNtXCbNy3/y5OAHZEi9KgPtwr1LTtLWAZC5DDCfmE="; 20 + # Upstream repo contains pre-compiled binaries and object files 21 + # that are out of date. 22 + # These need to be removed before build stage. 23 + postFetch = '' 24 + rm "$out/src/ryzen_monitor" 25 + make -C "$out" clean 26 + ''; 15 27 }; 16 28 17 - ## Remove binaries committed into upstream repo 18 - preBuild = '' 19 - rm src/ryzen_monitor 20 - ''; 21 - 22 - makeTargets = [ "clean" "install" ]; 23 - 24 - installPhase = '' 25 - runHook preInstall 26 - 27 - mkdir -p $out/bin 28 - mv ./src/ryzen_monitor $out/bin 29 + makeFlags = [ "PREFIX=${placeholder "out"}" ]; 29 30 30 - runHook postInstall 31 - ''; 31 + passthru.updateScript = unstableGitUpdater { }; 32 32 33 33 meta = with lib; { 34 34 description = "Access Ryzen SMU information exposed by the ryzen_smu driver"; 35 - homepage = "https://github.com/mann1x/ryzen_monitor_ng"; 36 - changelog = "https://github.com/mann1x/ryzen_monitor_ng/blob/master/CHANGELOG.md"; 35 + homepage = "https://github.com/plasmin/ryzen_monitor_ng"; 36 + changelog = "https://github.com/plasmin/ryzen_monitor_ng/blob/master/CHANGELOG.md"; 37 37 license = licenses.agpl3Only; 38 38 platforms = [ "x86_64-linux" ]; 39 39 maintainers = with maintainers; [ phdyellow ];