diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2023-07-20 16:55:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-20 16:55:27 +0200 |
commit | 03bdf06c5564e24fe183fd3c0c524e9c9c413a0a (patch) | |
tree | c9823600ff02a1a9d2c9747af7b799f6be12ee64 /pkgs/applications/terminal-emulators | |
parent | 56f391f69a4ed7672efebf6fc1cabf3041b1839a (diff) | |
parent | 4c6d4170f2ac4c92dbf3cf60cd4c7b96cae18d2e (diff) |
Merge pull request #244398 from tfmoraes/blackbox_terminal_0.14
Diffstat (limited to 'pkgs/applications/terminal-emulators')
-rw-r--r-- | pkgs/applications/terminal-emulators/blackbox-terminal/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 9b0905d27abcf..83cba0abc8d46 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -27,14 +27,14 @@ let in stdenv.mkDerivation rec { pname = "blackbox"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "raggesilver"; repo = "blackbox"; rev = "v${version}"; - hash = "sha256-qz1805HLG/Yexilw0YCkTzed1wqonUtJ+QrbMyhKHh8="; + hash = "sha256-ebwh9WTooJuvYFIygDBn9lYC7+lx9P1HskvKU8EX9jw="; }; postPatch = '' @@ -64,6 +64,8 @@ stdenv.mkDerivation rec { libgee ]; + mesonFlags = [ "-Dblackbox_is_flatpak=false" ]; + meta = with lib; { description = "Beautiful GTK 4 terminal"; homepage = "https://gitlab.gnome.org/raggesilver/blackbox"; diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix index 6d100c0894e48..e6c3850416f63 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix @@ -13,15 +13,15 @@ stdenv.mkDerivation { pname = "marble"; - version = "unstable-2022-04-20"; + version = "unstable-2023-05-11"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "raggesilver"; repo = "marble"; - # Latest commit from the 'wip/gtk4' branch - rev = "6dcc6fefa35f0151b0549c01bd774750fe6bdef8"; - sha256 = "sha256-0VJ9nyjWOOdLBm3ufleS/xcAS5YsSedJ2NtBjyM3uaY="; + # the same used on flatpak + rev = "f240b2ec7d5cdacb8fdcc553703420dc5101ffdb"; + sha256 = "sha256-obtz7zOyEZPgi/NNjtLr6aFm/1UVTzjTdJpN3JQfpUs="; }; nativeBuildInputs = [ |