From 1a242ec25d07c9e3b18e96dc0bdfb6c166beff26 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Mon, 9 Oct 2023 01:16:00 +0200 Subject: [PATCH 1/2] darktile: 0.0.10 -> 0.0.11 --- .../terminal-emulators/darktile/default.nix | 33 +++++-------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index fc2b470178f3..d300853ee4a5 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , lib -, go , pkg-config , libX11 , libXcursor @@ -12,20 +11,23 @@ , libXxf86vm , libGL , nixosTests +, buildGoModule }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "darktile"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "liamg"; repo = "darktile"; rev = "v${version}"; - sha256 = "0pdj4yv3qrq56gb67p85ara3g8qrzw5ha787bl2ls4vcx85q7303"; + hash = "sha256-M3vySAyYwqscR9n0GGXp1ttO/mhdSCponZNYJRBBI18="; }; - nativeBuildInputs = [ go pkg-config ]; + vendorHash = null; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 @@ -38,25 +40,6 @@ stdenv.mkDerivation rec { libGL ]; - postPatch = '' - substituteInPlace scripts/build.sh \ - --replace "bash" "sh" - ''; - - postConfigure = '' - export GOPATH=$TMP/go - ''; - - makeFlags = [ "HOME=$TMP" ]; - - installPhase = '' - runHook preInstall - - install -Dm755 darktile -t $out/bin - - runHook postInstall - ''; - passthru.tests.test = nixosTests.terminal-emulators.darktile; meta = with lib; { @@ -65,7 +48,7 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/liamg/darktile/releases"; changelog = "https://github.com/liamg/darktile/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ flexagoon ]; + maintainers = with maintainers; [ mikaelfangel ]; mainProgram = "darktile"; }; } From 3bff45aac60acab116d35195aa9f53390bf401a1 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Mon, 11 Dec 2023 21:07:21 +0100 Subject: [PATCH 2/2] darktile: add aarch64-linux to badPlatforms --- pkgs/applications/terminal-emulators/darktile/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index d300853ee4a5..2aaa68801cb7 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -48,6 +48,8 @@ buildGoModule rec { downloadPage = "https://github.com/liamg/darktile/releases"; changelog = "https://github.com/liamg/darktile/releases/tag/v${version}"; license = licenses.mit; + platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; maintainers = with maintainers; [ mikaelfangel ]; mainProgram = "darktile"; };