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>
This commit is contained in:
parent
0e989a5bd9
commit
05bfbc9951
@ -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 = {
|
||||
|
Loading…
Reference in New Issue
Block a user