From 6a6de265315c82fae4aec6096455de5bb346fff9 Mon Sep 17 00:00:00 2001 From: Olivier Nicole Date: Wed, 10 Aug 2022 13:44:04 +0200 Subject: [PATCH 1/2] gopsuinfo: init at 0.1.1 --- pkgs/tools/system/gopsuinfo/default.nix | 40 +++++++++++++++++++ .../system/gopsuinfo/no_bin_install.patch | 12 ++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 54 insertions(+) create mode 100644 pkgs/tools/system/gopsuinfo/default.nix create mode 100644 pkgs/tools/system/gopsuinfo/no_bin_install.patch diff --git a/pkgs/tools/system/gopsuinfo/default.nix b/pkgs/tools/system/gopsuinfo/default.nix new file mode 100644 index 00000000000..2499b85ae04 --- /dev/null +++ b/pkgs/tools/system/gopsuinfo/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gopsuinfo"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = "gopsuinfo"; + rev = "v${version}"; + sha256 = "sha256-lEc5k89L0ViihcbYh6I5m+Z6Q/rhLFGwftc3WD2EJ/M="; + }; + + vendorSha256 = "sha256-RsplFwUL4KjWaXE6xvURX+4wkNG+i+1oyBXwLyVcb2Q="; + + # Remove installing of binary from the Makefile (already taken care of by + # `buildGoModule`) + patches = [ + ./no_bin_install.patch + ]; + + # Fix absolute path of icons in the code + postPatch = '' + substituteInPlace gopsuinfo.go \ + --replace "/usr/share/gopsuinfo" "$out/usr/share/gopsuinfo" + ''; + + # Install icons + postInstall = '' make install DESTDIR=$out ''; + + meta = with lib; { + description = "A gopsutil-based command to display system usage info"; + homepage = "https://github.com/nwg-piotr/gopsuinfo"; + license = licenses.bsd2; + maintainers = with maintainers; [ otini ]; + }; +} diff --git a/pkgs/tools/system/gopsuinfo/no_bin_install.patch b/pkgs/tools/system/gopsuinfo/no_bin_install.patch new file mode 100644 index 00000000000..ffbc31e3406 --- /dev/null +++ b/pkgs/tools/system/gopsuinfo/no_bin_install.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index d33866c..e0aafb4 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,7 +8,6 @@ install: + mkdir -p "${DESTDIR}/usr/share/gopsuinfo" "${DESTDIR}/usr/bin" + cp -R icons_light "${DESTDIR}/usr/share/gopsuinfo" + cp -R icons_dark "${DESTDIR}/usr/share/gopsuinfo" +- cp bin/gopsuinfo "${DESTDIR}/usr/bin/" + + uninstall: + rm -r "${DESTDIR}/usr/share/gopsuinfo" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 359aff33b8a..3574fc5b0a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1432,6 +1432,8 @@ with pkgs; goldberg-emu = callPackage ../applications/emulators/goldberg-emu { }; + gopsuinfo = callPackage ../tools/system/gopsuinfo { }; + gxemul = callPackage ../applications/emulators/gxemul { }; hatari = callPackage ../applications/emulators/hatari { }; From 3f9a94502571257b56b761bd5be6d68897f34fb0 Mon Sep 17 00:00:00 2001 From: Olivier Nicole Date: Thu, 18 Aug 2022 18:33:06 +0200 Subject: [PATCH 2/2] gopsuinfo: mark package as Linux-only --- pkgs/tools/system/gopsuinfo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/system/gopsuinfo/default.nix b/pkgs/tools/system/gopsuinfo/default.nix index 2499b85ae04..47d9500bf60 100644 --- a/pkgs/tools/system/gopsuinfo/default.nix +++ b/pkgs/tools/system/gopsuinfo/default.nix @@ -36,5 +36,6 @@ buildGoModule rec { homepage = "https://github.com/nwg-piotr/gopsuinfo"; license = licenses.bsd2; maintainers = with maintainers; [ otini ]; + platforms = platforms.linux; }; }