diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-08-07 17:12:11 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-11 18:52:15 +0200 |
| commit | 05bfbc995173790892988b5aa00c5b07117e66c5 (patch) | |
| tree | 5b7c54068bc59659aba306c3b9219990fabb5442 /pkgs/applications/terminal-emulators | |
| parent | 0e989a5bd96ee67ad435b3b548c5ab85ec514b23 (diff) | |
gnome-console: 42.2 → 43.beta
https://gitlab.gnome.org/GNOME/console/-/compare/42.2...43.beta Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/applications/terminal-emulators')
| -rw-r--r-- | pkgs/applications/terminal-emulators/gnome-console/default.nix | 46 |
1 files changed, 10 insertions, 36 deletions
diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 92bf1749e80e0..adb4bc577100e 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -1,75 +1,49 @@ { lib , stdenv , fetchurl -, fetchpatch , gettext , gnome , libgtop -, gtk3 -, libhandy +, gtk4 +, libadwaita , pcre2 -, vte +, vte-gtk4 , appstream-glib , desktop-file-utils -, git , meson , ninja , pkg-config , python3 -, sassc -, wrapGAppsHook +, wrapGAppsHook4 , nixosTests }: stdenv.mkDerivation rec { pname = "gnome-console"; - version = "42.2"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk="; + sha256 = "t4TcSBVe86AkzYij9/650JO9mcZfKpcVo3+fu7Wq8VY="; }; - patches = [ - (fetchpatch { - name = "fix-clang-build-issues.patch"; - url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch"; - sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs="; - }) - - # Fix Nautilus extension in 43. - # https://gitlab.gnome.org/GNOME/console/-/merge_requests/104 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/console/-/commit/e0131faeabdce95bfe1ea260b1ed439120abf1db.patch"; - sha256 = "56lw/lTshVVda31ohcS8j38JL4UwyvtmSLEYkUMYylY="; - }) - ]; - buildInputs = [ gettext libgtop - gtk3 - libhandy + gtk4 + libadwaita pcre2 - vte - ] ++ lib.optionals stdenv.isLinux [ - gnome.nautilus + vte-gtk4 ]; nativeBuildInputs = [ appstream-glib desktop-file-utils - git meson ninja pkg-config python3 - sassc - wrapGAppsHook - ]; - - mesonFlags = lib.optionals (!stdenv.isLinux) [ - "-Dnautilus=disabled" + wrapGAppsHook4 ]; passthru = { |