-
-
Notifications
You must be signed in to change notification settings - Fork 15.4k
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
webkitgtk: 2.16.6 -> 2.18.0 #29796
webkitgtk: 2.16.6 -> 2.18.0 #29796
Conversation
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec { | |||
|
|||
# XXX: WebKit2 missing include path for gst-plugins-base. | |||
# Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 | |||
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0" | |||
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0" |
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.
This should not be necessary, the bug was already fixed, see jtojnar@3b4df8d
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'm a bit confused: In your update branch, you leave the build flag in: jtojnar@99796a4
I'll push the workaround for now, since that's what built for me, but I would like to incorporate your cleanup.
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 am not removing it since it was already removed in aebae6c
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.
Yep, that should have rang a bell. I was just stupid. I'd even been thinking about this needing to go to staging, yet, it didn't occur to me, to look there.
pkgs/top-level/all-packages.nix
Outdated
|
||
webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { | ||
harfbuzz = harfbuzz-icu; | ||
gst-plugins-base = gst_all_1.gst-plugins-base; | ||
inherit (darwin) libobjc; | ||
}; | ||
|
||
webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix { | ||
webkitgtk217x = callPackage ../development/libraries/webkitgtk/2.17.nix { |
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.
2.17 is unstable version of 2.18. As such, it can be removed.
df7cb70
to
56f3648
Compare
remove references to 216x
56f3648
to
cbfeb4d
Compare
Sorry, I just saw that this already went to staging. I reverted the commit to master. Still, staging should be updated to 2.18.2 |
Motivation for this change
stable update
Things done
update dependents
just built, will test when I get home
build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)