diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-26 00:02:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-26 00:02:12 +0000 |
| commit | 24a900e5575557719979223ac54b24dc2e176d08 (patch) | |
| tree | f45551c6e5240746ec8570e38888b25e3757d14f /pkgs/applications/terminal-emulators | |
| parent | f6ece27ed4a1984d636c433544524a716eb8ebab (diff) | |
| parent | 904b22f4024a67b196eda237e8b7cdd2fd4fe7ee (diff) | |
| download | nixlib-24a900e5575557719979223ac54b24dc2e176d08.tar nixlib-24a900e5575557719979223ac54b24dc2e176d08.tar.gz nixlib-24a900e5575557719979223ac54b24dc2e176d08.tar.bz2 nixlib-24a900e5575557719979223ac54b24dc2e176d08.tar.lz nixlib-24a900e5575557719979223ac54b24dc2e176d08.tar.xz nixlib-24a900e5575557719979223ac54b24dc2e176d08.tar.zst nixlib-24a900e5575557719979223ac54b24dc2e176d08.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/terminal-emulators')
| -rw-r--r-- | pkgs/applications/terminal-emulators/darktile/default.nix | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index fc2b470178f3..2aaa68801cb7 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,9 @@ 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 ]; + platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; + maintainers = with maintainers; [ mikaelfangel ]; mainProgram = "darktile"; }; } |