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.
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
Spidermonkey cleanup #51942
Spidermonkey cleanup #51942
Conversation
- build with `--enable-optimize` - remove unused nspr dependency - cleanup a static library (saves ~20mb)
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec { | |||
doCheck = true; | |||
|
|||
nativeBuildInputs = [ meson ninja pkgconfig gettext glib ]; | |||
buildInputs = [ spidermonkey_52 ]; | |||
buildInputs = [ spidermonkey_60 ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only js52 is supported for running the tests: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.30.1/meson.build
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, good catch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I reverted and added a note.
46352d5
to
fd18d18
Compare
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec { | |||
doCheck = true; | |||
|
|||
nativeBuildInputs = [ meson ninja pkgconfig gettext glib ]; | |||
# 52 is required for tests | |||
# https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.30.1/meson.build#L25 | |||
buildInputs = [ spidermonkey_52 ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we can move this to checkInputs
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That would work. I was about to do it, but wondered if it would get picked up since it's detected in the main meson.build file, should've just done it :)
Also move spidermonkey_52 to checkInputs as it's not a runtime dependency.
fd18d18
to
8633131
Compare
The default should probably be 38 as 52 and 60 doesn't include a |
52 and 60 doesn't include `bin/js` only `bin/js52` etc. Some derivations depending on spidermonkey require `js` to a be a command (at least `jsawk`).
No longer in use.
Update to the last version of 38
8633131
to
880f4b3
Compare
Could someone trigger a darwin build for spidermonkey_38? I've been putting off getting the permissions :/ |
@GrahamcOfBorg build spidermonkey_38 |
Motivation for this change
We keep a lot of spidermonkey versions, one which wasn't used at all. The default version was also very old and was only used three places:
I changed the default to6038 which didn't break the build of the above packages, though I didn't tested them in any serious fashionChanged default to 38 as some dependencies require a
js
binary which 52 and 60 doesn't ship with (could link, but eg. fedora and arch doesn't at least).Things done
Of note:
In particular I turned on
--enable-optimize
this made the build a bit slower, but should hopefully be worth i (it turns on-O3
). Eg. fedora disabled it a long time ago due to a gcc bug which is no longer with us. I ran up a VM with gnome and testedgnome-maps
which uses gjs without problemsDid a nix-review:
34 package were build:
- adapta-gtk-theme - arc-theme - buildah - chrome-gnome-shell - flatpak - flatpak-builder - gnome-builder - gnome3.anjuta - gnome3.gjs - gnome3.gnome-characters - gnome3.gnome-documents - gnome3.gnome-flashback - gnome3.gnome-maps - gnome3.gnome-session - gnome3.gnome-shell - gnome3.gnome-shell-extensions - gnome3.gnome-software - gnome3.gnome-sound-recorder - gnome3.gnome-terminal - gnome3.gnome-tweak-tool - gnome3.gnome-weather - gnome3.gpaste - gnome3.polari - gnome3.pomodoro - gnome3.sushi - gtkpod - jsawk - minishift - ostree - plowshare - pyload - rpm-ostree - skopeo - spidermonkeysandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)