pyrox.dev
Merge pull request #183352 from wegank/vte-darwin
+16
-2
pkgs/applications/terminal-emulators/gnome-console/default.nix
+16
-2
pkgs/applications/terminal-emulators/gnome-console/default.nix
···
1
1
{ lib
2
2
, stdenv
3
3
, fetchurl
4
+
, fetchpatch
4
5
, gettext
5
6
, gnome
6
7
, libgtop
···
28
29
url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
29
30
sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk=";
30
31
};
32
+
33
+
patches = [
34
+
(fetchpatch {
35
+
name = "fix-clang-build-issues.patch";
36
+
url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch";
37
+
sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs=";
38
+
})
39
+
];
31
40
32
41
buildInputs = [
33
42
gettext
34
43
libgtop
35
-
gnome.nautilus
36
44
gtk3
37
45
libhandy
38
46
pcre2
39
47
vte
48
+
] ++ lib.optionals stdenv.isLinux [
49
+
gnome.nautilus
40
50
];
41
51
42
52
nativeBuildInputs = [
···
51
61
wrapGAppsHook
52
62
];
53
63
64
+
mesonFlags = lib.optionals (!stdenv.isLinux) [
65
+
"-Dnautilus=disabled"
66
+
];
67
+
54
68
passthru = {
55
69
updateScript = gnome.updateScript {
56
70
packageName = pname;
···
64
78
homepage = "https://gitlab.gnome.org/GNOME/console";
65
79
license = licenses.gpl3Plus;
66
80
maintainers = teams.gnome.members ++ (with maintainers; [ zhaofengli ]);
67
-
platforms = platforms.linux;
81
+
platforms = platforms.unix;
68
82
};
69
83
}
+3
-1
pkgs/development/libraries/vte/default.nix
+3
-1
pkgs/development/libraries/vte/default.nix
···
78
78
79
79
mesonFlags = lib.optionals (!systemdSupport) [
80
80
"-D_systemd=false"
81
+
] ++ lib.optionals stdenv.isDarwin [
82
+
# -Bsymbolic-functions is not supported on darwin
83
+
"-D_b_symbolic_functions=false"
81
84
];
82
85
83
86
postPatch = ''
···
98
101
};
99
102
100
103
meta = with lib; {
101
-
broken = stdenv.isDarwin;
102
104
homepage = "https://www.gnome.org/";
103
105
description = "A library implementing a terminal emulator widget for GTK";
104
106
longDescription = ''