Merge pull request #96140 from matthewbauer/add-cog

Init cog at 0.6.0
This commit is contained in:
Matthew Bauer 2021-01-20 17:42:54 -06:00 committed by GitHub
commit 77403c1c19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 171 additions and 1 deletions

View file

@ -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;
};
}

View file

@ -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;
};
}

View file

@ -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"

View file

@ -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;
};
}

View file

@ -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 { };