Merge pull request #183352 from wegank/vte-darwin

authored by Sandro and committed by GitHub 85f8f070 06db1de3

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