From 8f027e6b6578dfd7e7228682acf4fa32b5104c5e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 22 Aug 2020 23:27:41 -0500 Subject: [PATCH 1/4] libwpe: init at 1.7.1 --- pkgs/development/libraries/libwpe/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/libwpe/default.nix diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix new file mode 100644 index 00000000000..102d658000c --- /dev/null +++ b/pkgs/development/libraries/libwpe/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, fetchurl +, meson +, pkg-config +, libxkbcommon +, libGL +, ninja +, libX11 }: + +stdenv.mkDerivation rec { + pname = "libwpe"; + version = "1.7.1"; + + src = fetchurl { + url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; + sha256 = "0h6kh8wy2b370y705pl2vp6vp18dkdsgdxh0243ji2v51kxbg157"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = [ + libxkbcommon + libGL + libX11 + ]; + + meta = with lib; { + description = "General-purpose library for WPE WebKit"; + license = licenses.bsd2; + homepage = "https://wpewebkit.org"; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3667a63a03e..a59a1b8bd50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14606,6 +14606,8 @@ in libixp_hg = callPackage ../development/libraries/libixp-hg { }; + libwpe = callPackage ../development/libraries/libwpe { }; + libyaml = callPackage ../development/libraries/libyaml { }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; From b2eb8992c78f744c3c6408f96287290ec04c2870 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 22 Aug 2020 23:42:57 -0500 Subject: [PATCH 2/4] libwpe-fdo: init at 1.7.1 --- pkgs/development/libraries/libwpe/fdo.nix | 52 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/libraries/libwpe/fdo.nix diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix new file mode 100644 index 00000000000..6f9356a6ad8 --- /dev/null +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchurl +, meson +, pkg-config +, ninja +, wayland +, epoxy +, glib +, libwpe +, libxkbcommon +, libGL +, libX11 }: + +stdenv.mkDerivation rec { + pname = "wpebackend-fdo"; + version = "1.7.1"; + + src = fetchurl { + url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; + sha256 = "1xf6akagvpyh0nyxkfijrx5avp6ravnivy28dhk64dsfx9rhm64v"; + }; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + pkg-config + meson + ninja + wayland + ]; + + buildInputs = [ + wayland + epoxy + glib + libwpe + libxkbcommon + libGL + libX11 + ]; + + meta = with lib; { + description = "Freedesktop.org backend for WPE WebKit"; + license = licenses.bsd2; + homepage = "https://wpewebkit.org"; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a59a1b8bd50..cdca6c88c5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14608,6 +14608,8 @@ in libwpe = callPackage ../development/libraries/libwpe { }; + libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { }; + libyaml = callPackage ../development/libraries/libyaml { }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; From 132f7e6cfed4eaefe2aac9c867e5549b8e37591c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 22 Aug 2020 23:43:17 -0500 Subject: [PATCH 3/4] webkitgtk: enable WPE_RENDERER --- pkgs/development/libraries/webkitgtk/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 814a1f22592..7f98ed8069f 100644 --- 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; @@ -119,6 +121,8 @@ stdenv.mkDerivation rec { libsecret libtasn1 libwebp + libwpe + libwpe-fdo libxkbcommon libxml2 libxslt @@ -153,7 +157,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" From 914de3a3ca9dbf47c0ae667b085cac558ae9314d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 23 Aug 2020 23:53:31 -0500 Subject: [PATCH 4/4] cog: init at 0.6.0 --- pkgs/development/web/cog/default.nix | 70 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/development/web/cog/default.nix diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix new file mode 100644 index 00000000000..f1ddaea80d7 --- /dev/null +++ b/pkgs/development/web/cog/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchpatch +, fetchFromGitHub +, cmake +, pkg-config +, wayland +, wayland-protocols +, libwpe +, libwpe-fdo +, glib +, glib-networking +, webkitgtk +, makeWrapper +, wrapGAppsHook +, gnome3 +, gdk-pixbuf +}: + +stdenv.mkDerivation rec { + pname = "cog"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "igalia"; + repo = "cog"; + rev = "v${version}"; + sha256 = "0a0zpdki1whm5gb6ycbazvwmm1fz094mkfwjfy4a7zz0pk54h1jw"; + }; + + buildInputs = [ + wayland-protocols + wayland + libwpe + libwpe-fdo + webkitgtk + glib-networking + gdk-pixbuf + gnome3.adwaita-icon-theme + ]; + + nativeBuildInputs = [ + cmake + pkg-config + wayland + makeWrapper + wrapGAppsHook + ]; + + depsBuildsBuild = [ + pkg-config + ]; + + cmakeFlags = [ + "-DCOG_USE_WEBKITGTK=ON" + ]; + + # not ideal, see https://github.com/WebPlatformForEmbedded/libwpe/issues/59 + preFixup = '' + wrapProgram $out/bin/cog \ + --prefix LD_LIBRARY_PATH : ${libwpe-fdo}/lib + ''; + + meta = with lib; { + description = "A small single “window” launcher for the WebKit WPE port"; + license = licenses.mit; + maintainers = [ maintainers.matthewbauer ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdca6c88c5d..8812d389fb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12395,6 +12395,8 @@ in cointop = callPackage ../applications/misc/cointop { }; + cog = callPackage ../development/web/cog { }; + ctl = callPackage ../development/libraries/ctl { }; ctpp2 = callPackage ../development/libraries/ctpp2 { };