[24.05] emacs: do not allow webkitgtk on Emacs >= 30 #344740
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
An incompatibility with newer versions of webkit2gtk was revealed upstream (https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html). (cherry picked from commit a755ead)
jian-lin
reviewed
Sep 27, 2024
| @@ -88,7 +88,7 @@ | |||
| , withWebP ? lib.versionAtLeast version "29" | |||
| , withX ? !(stdenv.isDarwin || noGui || withPgtk) | |||
| , withXinput2 ? withX && lib.versionAtLeast version "29" | |||
| , withXwidgets ? !stdenv.isDarwin && !noGui && (withGTK3 || withPgtk) | |||
| , withXwidgets ? !stdenv.hostPlatform.isDarwin && !noGui && (withGTK3 || withPgtk) && (lib.versionOlder version "30") # XXX: upstream bug 66068 precludes newer versions of webkit2gtk (https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html) | |||
There was a problem hiding this comment.
hostPlatform seem not necessary
> nix repl github:nixos/nixpkgs/nixos-24.05 2:19Nix 2.24.8
Type :? for help.
Loading installable 'github:nixos/nixpkgs/nixos-24.05#'...
Added 5 variables.
nix-repl> legacyPackages.x86_64-linux.stdenv.isDarwin
false
nix-repl> legacyPackages.x86_64-linux.stdenv.hostPlatform.isDarwin
falseThere was a problem hiding this comment.
I did hostPlatform since master already had this as hostPlatform (prior to my commit there) and I wanted the two branches to be consistent. Is it OK to have the branches diverge in this way? If so, I'm fine with omitting hostPlatform here to keep the diff clean.
There was a problem hiding this comment.
Oh, now I see why you add hostPlatform. I do not have a strong opinion on this.
jian-lin
approved these changes
Sep 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An incompatibility with newer versions of webkit2gtk was revealed
upstream (https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html).
(cherry picked from commit a755ead)
Backport of #344631