Merge pull request #96140 from matthewbauer/add-cog

Init cog at 0.6.0
2021-01-20 17:42:54 -06:00
parent 8adc564f28 914de3a3ca
commit 77403c1c19
5 changed files with 171 additions and 1 deletions
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -51,6 +51,8 @@
 , xdg-dbus-proxy
 , substituteAll
 , glib
+, libwpe
+, libwpe-fdo
 }:

 assert enableGeoLocation -> geoclue2 != null;
@@ -120,6 +122,8 @@ stdenv.mkDerivation rec {
    libsecret
    libtasn1
    libwebp
+    libwpe
+    libwpe-fdo
    libxkbcommon
    libxml2
    libxslt
@@ -154,7 +158,6 @@ 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"