Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 71313b975cf8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 04095230e0b8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 25, 2021

  1. Revert "webkitgtk: enable WPE_RENDERER" 

    This reverts commit 132f7e6.
    @matthewbauer
    matthewbauer committed Jan 25, 2021
    Copy the full SHA
    c0d053e View commit details

  2. Merge pull request #110738 from matthewbauer/revert-96140 

    Revert "webkitgtk: enable WPE_RENDERER"
    @SuperSandro2000
    SuperSandro2000 authored Jan 25, 2021
    Copy the full SHA
    0409523 View commit details
Showing with 1 addition and 4 deletions.
  1. +1 −4 pkgs/development/libraries/webkitgtk/default.nix
5 changes: 1 addition & 4 deletions pkgs/development/libraries/webkitgtk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -51,8 +51,6 @@
, xdg-dbus-proxy
, substituteAll
, glib
, libwpe
, libwpe-fdo
}:

assert enableGeoLocation -> geoclue2 != null;
@@ -122,8 +120,6 @@ stdenv.mkDerivation rec {
libsecret
libtasn1
libwebp
libwpe
libwpe-fdo
libxkbcommon
libxml2
libxslt
@@ -158,6 +154,7 @@ stdenv.mkDerivation rec {
"-DENABLE_INTROSPECTION=ON"
"-DPORT=GTK"
"-DUSE_LIBHYPHEN=OFF"
"-DUSE_WPE_RENDERER=OFF"
] ++ optionals stdenv.isDarwin [
"-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
"-DENABLE_GTKDOC=OFF"