From 37d8c4d2633fea252a44eb2024799bd15d896387 Mon Sep 17 00:00:00 2001 From: Emile Date: Tue, 29 Oct 2024 22:44:08 +0100 Subject: marvin pkg + module --- nix/pkgs/aarch64-darwin.nix | 1 + nix/pkgs/overlay.nix | 1 + nix/pkgs/remarvin/default.nix | 4 +--- nix/pkgs/x86_64-linux.nix | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) (limited to 'nix/pkgs') diff --git a/nix/pkgs/aarch64-darwin.nix b/nix/pkgs/aarch64-darwin.nix index c5ecaa7..081eb59 100644 --- a/nix/pkgs/aarch64-darwin.nix +++ b/nix/pkgs/aarch64-darwin.nix @@ -1,4 +1,5 @@ final: prev: { vokobe = final.callPackage ./vokobe { inherit (final) naersk; }; r2wars-web = final.callPackage ./r2wars-web { }; + remarvin = final.callPackage ./remarvin { }; } diff --git a/nix/pkgs/overlay.nix b/nix/pkgs/overlay.nix index c5ecaa7..081eb59 100644 --- a/nix/pkgs/overlay.nix +++ b/nix/pkgs/overlay.nix @@ -1,4 +1,5 @@ final: prev: { vokobe = final.callPackage ./vokobe { inherit (final) naersk; }; r2wars-web = final.callPackage ./r2wars-web { }; + remarvin = final.callPackage ./remarvin { }; } diff --git a/nix/pkgs/remarvin/default.nix b/nix/pkgs/remarvin/default.nix index 1da157f..a45bad2 100644 --- a/nix/pkgs/remarvin/default.nix +++ b/nix/pkgs/remarvin/default.nix @@ -10,7 +10,7 @@ pkgs.buildGoModule rec { src = fetchgit { url = "git://git.emile.space/remarvin.git"; - hash = "sha256-UahNwhsxFGSpaVTk2EFtjt/MCB4Ec/08QStylL2QPUM="; + hash = "sha256-jgV5bzQQ4n9v7PgFQ5n0yFTPcjgHNQ/BYPxzTp1Os4w="; }; vendorHash = null; @@ -19,8 +19,6 @@ pkgs.buildGoModule rec { postInstall = '' mkdir -p $out - cp -r templates $out - mv $out/bin/src $out/bin/remarvin ''; diff --git a/nix/pkgs/x86_64-linux.nix b/nix/pkgs/x86_64-linux.nix index c5ecaa7..081eb59 100644 --- a/nix/pkgs/x86_64-linux.nix +++ b/nix/pkgs/x86_64-linux.nix @@ -1,4 +1,5 @@ final: prev: { vokobe = final.callPackage ./vokobe { inherit (final) naersk; }; r2wars-web = final.callPackage ./r2wars-web { }; + remarvin = final.callPackage ./remarvin { }; } -- cgit 1.4.1