Skip to content

vte, gnome-console: add darwin support #183352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 2 commits into from
Aug 1, 2022
Merged

vte, gnome-console: add darwin support #183352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
752c062
vte: fix build on darwin
wegank Aug 1, 2022
e76a011
gnome-console: add darwin support
wegank Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions pkgs/applications/terminal-emulators/gnome-console/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, gettext
, gnome
, libgtop
Expand Down Expand Up @@ -29,14 +30,23 @@ stdenv.mkDerivation rec {
sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk=";
};

patches = [
(fetchpatch {
name = "fix-clang-build-issues.patch";
url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch";
sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs=";
})
];

buildInputs = [
gettext
libgtop
gnome.nautilus
gtk3
libhandy
pcre2
vte
] ++ lib.optionals stdenv.isLinux [
gnome.nautilus
];

nativeBuildInputs = [
Expand All @@ -51,6 +61,10 @@ stdenv.mkDerivation rec {
wrapGAppsHook
];

mesonFlags = lib.optionals (!stdenv.isLinux) [
"-Dnautilus=disabled"
];

passthru = {
updateScript = gnome.updateScript {
packageName = pname;
Expand All @@ -64,6 +78,6 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.gnome.org/GNOME/console";
license = licenses.gpl3Plus;
maintainers = teams.gnome.members ++ (with maintainers; [ zhaofengli ]);
platforms = platforms.linux;
platforms = platforms.unix;
};
}
4 changes: 3 additions & 1 deletion pkgs/development/libraries/vte/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ stdenv.mkDerivation rec {

mesonFlags = lib.optionals (!systemdSupport) [
"-D_systemd=false"
] ++ lib.optionals stdenv.isDarwin [
# -Bsymbolic-functions is not supported on darwin
"-D_b_symbolic_functions=false"
];

postPatch = ''
Expand All @@ -98,7 +101,6 @@ stdenv.mkDerivation rec {
};

meta = with lib; {
broken = stdenv.isDarwin;
homepage = "https://www.gnome.org/";
description = "A library implementing a terminal emulator widget for GTK";
longDescription = ''
Expand Down