Merge pull request #183352 from wegank/vte-darwin (85f8f070) · Commits · nix / nixpkgs

pkgs/applications/terminal-emulators/gnome-console/default.nix

+16 −2

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchurl
		, fetchpatch
		, gettext
		, gnome
		, libgtop
		@@ -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 = [
		@@ -51,6 +61,10 @@ stdenv.mkDerivation rec {
		wrapGAppsHook
		];

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

		passthru = {
		updateScript = gnome.updateScript {
		packageName = pname;
		@@ -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;
		};
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -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 = ''
		@@ -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 = ''