Skip to content
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

Jump to bottom

[24.05] emacs: do not allow webkitgtk on Emacs >= 30 #344740

Merged
merged 1 commit into from
Sep 27, 2024
Merged

[24.05] emacs: do not allow webkitgtk on Emacs >= 30 #344740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pkgs/applications/editors/emacs/make-emacs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
false

Copy link
Member Author

@leungbk leungbk Sep 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, now I see why you add hostPlatform. I do not have a strong opinion on this.

, withSmallJaDic ? false
, withCompressInstall ? true

Expand Down
Loading