summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2021-01-20 17:42:54 -0600
committerGitHub <noreply@github.com>2021-01-20 17:42:54 -0600
commit77403c1c19f9e9c5f8ba9bb24f83c07eace126b2 (patch)
tree237f88d583a1301e8286b91acc19dfc0f3809628
parent8adc564f284b1a01b5e219974721b1d541a4d999 (diff)
parent914de3a3ca9dbf47c0ae667b085cac558ae9314d (diff)
downloadnixpkgs-77403c1c19f9e9c5f8ba9bb24f83c07eace126b2.tar
nixpkgs-77403c1c19f9e9c5f8ba9bb24f83c07eace126b2.tar.gz
nixpkgs-77403c1c19f9e9c5f8ba9bb24f83c07eace126b2.tar.bz2
nixpkgs-77403c1c19f9e9c5f8ba9bb24f83c07eace126b2.tar.lz
nixpkgs-77403c1c19f9e9c5f8ba9bb24f83c07eace126b2.tar.xz
nixpkgs-77403c1c19f9e9c5f8ba9bb24f83c07eace126b2.tar.zst
nixpkgs-77403c1c19f9e9c5f8ba9bb24f83c07eace126b2.zip
Merge pull request #96140 from matthewbauer/add-cog
Init cog at 0.6.0
-rw-r--r--pkgs/development/libraries/libwpe/default.nix39
-rw-r--r--pkgs/development/libraries/libwpe/fdo.nix52
-rw-r--r--pkgs/development/libraries/webkitgtk/default.nix5
-rw-r--r--pkgs/development/web/cog/default.nix70
-rw-r--r--pkgs/top-level/all-packages.nix6
5 files changed, 171 insertions, 1 deletions
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/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/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 77650b322d7..0a58e997c22 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;
@@ -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"
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 604cb5312e0..5985483c4ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13184,6 +13184,8 @@ in
 
   cointop = callPackage ../applications/misc/cointop { };
 
+  cog = callPackage ../development/web/cog { };
+
   ctl = callPackage ../development/libraries/ctl { };
 
   ctpp2 = callPackage ../development/libraries/ctpp2 { };
@@ -15456,6 +15458,10 @@ in
 
   libixp_hg = callPackage ../development/libraries/libixp-hg { };
 
+  libwpe = callPackage ../development/libraries/libwpe { };
+
+  libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { };
+
   libyaml = callPackage ../development/libraries/libyaml { };
 
   libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };