mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 22:43:01 +00:00
treewide: replace webkitgtk to webkitgtk_4_0
sed -i 's/ webkitgtk\b/ webkitgtk_4_0/g' pkgs/**.nix sed -i 's/(webkitgtk\b/(webkitgtk_4_0/g' pkgs/**.nix sed -i 's/\.webkitgtk\b/.webkitgtk_4_0/g' pkgs/**.nix webkitgtk is currently pointing to that specific ABI version but the alias is going to start warning
This commit is contained in:
parent
c7739bb95e
commit
ccec93c1c7
@ -24,7 +24,7 @@
|
||||
, xcbutilkeysyms
|
||||
, xcb-util-cursor
|
||||
, gtk3
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, python3
|
||||
, curl
|
||||
, pcre
|
||||
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
|
||||
libXScrnSaver
|
||||
curl
|
||||
gtk3
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
freetype
|
||||
libGL
|
||||
libusb1
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, lib, fetchFromGitHub
|
||||
, gobject-introspection, makeWrapper, wrapGAppsHook3
|
||||
, gtk3, gst_all_1, python3
|
||||
, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk
|
||||
, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk_4_0
|
||||
, iconTheme ? adwaita-icon-theme
|
||||
, deviceDetectionSupport ? true
|
||||
, documentationSupport ? true
|
||||
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional multimediaKeySupport keybinder3
|
||||
++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs
|
||||
++ lib.optional podcastSupport python3.pkgs.feedparser
|
||||
++ lib.optional wikipediaSupport webkitgtk;
|
||||
++ lib.optional wikipediaSupport webkitgtk_4_0;
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytest
|
||||
|
@ -8,7 +8,7 @@
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, freetype
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, zenity
|
||||
, curl
|
||||
, xorg
|
||||
@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
alsa-lib
|
||||
curl
|
||||
freetype
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXext
|
||||
|
@ -21,7 +21,7 @@
|
||||
libmodplug,
|
||||
librsvg,
|
||||
libsoup,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
|
||||
# optional features
|
||||
withDbusPython ? false,
|
||||
@ -90,7 +90,7 @@ python3.pkgs.buildPythonApplication {
|
||||
libappindicator-gtk3
|
||||
libmodplug
|
||||
libsoup
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
]
|
||||
++ lib.optionals (withXineBackend) [ xine-lib ]
|
||||
++ lib.optionals (withGstreamerBackend) (
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper
|
||||
, alsa-lib, curl, gtk3, webkitgtk, zenity }:
|
||||
, alsa-lib, curl, gtk3, webkitgtk_4_0, zenity }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rymcast";
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
|
||||
buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ];
|
||||
buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk_4_0 zenity ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
|
@ -16,7 +16,7 @@
|
||||
, libopus
|
||||
, curl
|
||||
, gtk3
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libopus
|
||||
curl
|
||||
gtk3
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
|
@ -12,7 +12,7 @@
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libjack2
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
alsa-lib
|
||||
freetype
|
||||
libglvnd
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
] ++ runtimeDependencies;
|
||||
|
||||
runtimeDependencies = map lib.getLib [
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, python3
|
||||
, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk
|
||||
, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config python3 ];
|
||||
buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ];
|
||||
buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk_4_0 ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs src/tunefish4/generate-lv2-ttl.py
|
||||
|
@ -12,7 +12,7 @@
|
||||
, glib
|
||||
, glib-networking
|
||||
, libxml2
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, clutter-gtk
|
||||
, clutter-gst
|
||||
, libunity
|
||||
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||
libunity
|
||||
pantheon.granite
|
||||
sqlite
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
glib-networking
|
||||
];
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
makeWrapper,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
zenity,
|
||||
Cocoa,
|
||||
Security,
|
||||
@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
buildInputs =
|
||||
lib.optional stdenv.hostPlatform.isDarwin Security
|
||||
++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk
|
||||
++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0
|
||||
++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [
|
||||
Cocoa
|
||||
WebKit
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
|
||||
, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk
|
||||
, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk_4_0
|
||||
, makeWrapper, perl, ... }:
|
||||
|
||||
{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }:
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11
|
||||
libXrender libXtst libsecret zlib
|
||||
] ++ lib.optional (webkitgtk != null) webkitgtk;
|
||||
] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0;
|
||||
|
||||
buildCommand = ''
|
||||
# Unpack tarball.
|
||||
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
|
||||
--prefix PATH : ${jdk}/bin \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0)} \
|
||||
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration"
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper
|
||||
, freetype, fontconfig, libX11, libXrender, zlib
|
||||
, glib, gtk3, gtk2, libXtst, jdk, jdk8, gsettings-desktop-schemas
|
||||
, webkitgtk ? null # for internal web browser
|
||||
, webkitgtk_4_0 ? null # for internal web browser
|
||||
, buildEnv, runCommand
|
||||
, callPackage
|
||||
}:
|
||||
@ -29,7 +29,7 @@ in rec {
|
||||
# work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3
|
||||
buildEclipseUnversioned = callPackage ./build-eclipse.nix {
|
||||
inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
|
||||
jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk
|
||||
jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk_4_0
|
||||
makeWrapper;
|
||||
};
|
||||
buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; });
|
||||
|
@ -55,7 +55,7 @@
|
||||
, systemd
|
||||
, tree-sitter
|
||||
, texinfo
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
, zlib
|
||||
|
||||
@ -274,7 +274,7 @@ mkDerivation (finalAttrs: {
|
||||
] ++ lib.optionals withXinput2 [
|
||||
libXi
|
||||
] ++ lib.optionals withXwidgets [
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
sigtool
|
||||
] ++ lib.optionals withNS [
|
||||
|
@ -9,7 +9,7 @@
|
||||
, gtkspell3
|
||||
, librsvg
|
||||
, pygobject3
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
@ -36,7 +36,7 @@ buildPythonApplication rec {
|
||||
gtkspell3
|
||||
librsvg
|
||||
pygobject3
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
# Needs a display
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, perl, bison
|
||||
, texinfo, desktop-file-utils, wrapGAppsHook3, docbook2x, docbook-xsl-nons
|
||||
, inform7, gettext, libossp_uuid, gtk3, gobject-introspection, vala, gtk-doc
|
||||
, webkitgtk, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib
|
||||
, webkitgtk_4_0, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib
|
||||
, gst_all_1 }:
|
||||
|
||||
# Neither gnome-inform7 nor its dependencies ratify and chimara have tagged releases in the GTK3 branch yet.
|
||||
@ -92,7 +92,7 @@ in stdenv.mkDerivation {
|
||||
gtk3
|
||||
gtksourceview3
|
||||
gspell
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
libxml2
|
||||
goocanvas2
|
||||
libplist
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, buildPythonApplication, fetchFromGitHub
|
||||
, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
|
||||
, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk_4_0
|
||||
, pygobject3, pyyaml, setuptools
|
||||
}:
|
||||
|
||||
@ -23,7 +23,7 @@ buildPythonApplication rec {
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk
|
||||
gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk_4_0
|
||||
pygobject3 pyyaml
|
||||
];
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
, openssl
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
let
|
||||
@ -74,7 +74,7 @@ rustPlatform.buildRustPackage {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk ];
|
||||
buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk_4_0 ];
|
||||
|
||||
checkFlags = [
|
||||
# tries to mutate the parent directory
|
||||
|
@ -31,7 +31,7 @@
|
||||
, python3
|
||||
, desktop-file-utils
|
||||
, itstool
|
||||
, withWebservices ? true, webkitgtk
|
||||
, withWebservices ? true, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
|
||||
libtiff
|
||||
libwebp
|
||||
libX11
|
||||
] ++ lib.optional withWebservices webkitgtk;
|
||||
] ++ lib.optional withWebservices webkitgtk_4_0;
|
||||
|
||||
mesonFlags = [
|
||||
"-Dlibchamplain=true"
|
||||
|
@ -7,7 +7,7 @@
|
||||
, glib
|
||||
, gtk3
|
||||
, libgee
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, clutter-gtk
|
||||
, clutter-gst
|
||||
, ninja
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
glib
|
||||
gtk3
|
||||
libgee
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
clutter-gtk
|
||||
clutter-gst
|
||||
];
|
||||
|
@ -39,7 +39,7 @@
|
||||
pcre,
|
||||
systemd,
|
||||
tbb_2021_11,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
wxGTK31,
|
||||
xorg,
|
||||
withSystemd ? stdenv.hostPlatform.isLinux,
|
||||
@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
|
||||
openvdb_tbb_2021_8
|
||||
pcre
|
||||
tbb_2021_11
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
wxGTK31'
|
||||
xorg.libX11
|
||||
] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs;
|
||||
|
@ -4,7 +4,7 @@
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, openssl
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, libappindicator
|
||||
, wrapGAppsHook3
|
||||
, shared-mime-info
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
libappindicator
|
||||
|
||||
glib-networking
|
||||
|
@ -7,7 +7,7 @@
|
||||
, freetype
|
||||
, libsoup
|
||||
, gtk3
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, perl
|
||||
, cyrus_sasl
|
||||
, stdenv
|
||||
@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
|
||||
freetype
|
||||
libsoup
|
||||
gtk3
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -13,7 +13,7 @@
|
||||
, gtk3
|
||||
, libnotify
|
||||
, pango
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
|
||||
# check inputs
|
||||
@ -93,7 +93,7 @@ buildPythonApplication rec {
|
||||
gtk3
|
||||
libnotify
|
||||
pango
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
] ++ (with gst_all_1; [
|
||||
gst-libav
|
||||
gst-plugins-bad
|
||||
|
@ -7,7 +7,7 @@
|
||||
let
|
||||
|
||||
qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ];
|
||||
gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ];
|
||||
gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk_4_0 ];
|
||||
xorgDeps = pkgs: with pkgs.xorg; [
|
||||
libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
|
||||
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
|
||||
|
@ -9,7 +9,7 @@
|
||||
, steam-run
|
||||
, substituteAll
|
||||
, unzip
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pythonPath = [
|
||||
python3Packages.pygobject3
|
||||
python3Packages.requests
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee
|
||||
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook3
|
||||
, qrencode, webkitgtk, discount, json-glib, fetchpatch }:
|
||||
, qrencode, webkitgtk_4_0, discount, json-glib, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfpc";
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
(gst-plugins-good.override { gtkSupport = true; })
|
||||
gst-libav
|
||||
qrencode
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
discount
|
||||
json-glib
|
||||
];
|
||||
|
@ -11,7 +11,7 @@
|
||||
, perl
|
||||
, sqlite
|
||||
, tzdata
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
, xvfb-run
|
||||
}:
|
||||
@ -54,7 +54,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
sqlite
|
||||
gtk3
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
glib-networking
|
||||
adwaita-icon-theme
|
||||
gdk-pixbuf
|
||||
|
@ -3,7 +3,7 @@
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, gtksourceview4
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
, python3Packages
|
||||
}:
|
||||
@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
|
||||
# webkitgtk is used for rendering interactive statistics graph which
|
||||
# can be seen by opening a ROM, entering Pokemon section, selecting
|
||||
# any Pokemon, and clicking Stats and Moves tab.
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,7 +8,7 @@
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, wrapGAppsHook3
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, libnotify
|
||||
, keybinder3
|
||||
, libappindicator
|
||||
@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
|
||||
libappindicator
|
||||
libnotify
|
||||
librsvg
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
wmctrl
|
||||
];
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret, webkitgtk }:
|
||||
{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret, webkitgtk_4_0 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-directory-studio";
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
makeWrapper "$dest/ApacheDirectoryStudio" \
|
||||
"$out/bin/ApacheDirectoryStudio" \
|
||||
--prefix PATH : "${jdk}/bin" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk ])}
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk_4_0 ])}
|
||||
install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm"
|
||||
install -D -t "$out/share/applications" ${desktopItem}/share/applications/*
|
||||
'';
|
||||
|
@ -5,7 +5,7 @@
|
||||
, pkg-config
|
||||
, ed
|
||||
, wrapGAppsHook3
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, libxml2
|
||||
, glib-networking
|
||||
, gettext
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
libxml2
|
||||
gettext
|
||||
glib-networking
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, fetchgit, meson, ninja, pkg-config, nix-update-script
|
||||
, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib
|
||||
, python3, gtk3, libsecret, gst_all_1, webkitgtk_4_0, glib
|
||||
, glib-networking, gtkspell3, hunspell, desktop-file-utils
|
||||
, gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }:
|
||||
|
||||
@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
gtkspell3
|
||||
hunspell
|
||||
libsecret
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
glib
|
||||
];
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, python3
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
, glib-networking
|
||||
}:
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
libdazzle
|
||||
libgee
|
||||
pantheon.granite
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -10,7 +10,7 @@
|
||||
, luafilesystem
|
||||
, luajit
|
||||
, sqlite
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
luafilesystem
|
||||
luajit
|
||||
sqlite
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
] ++ ( with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
|
@ -9,7 +9,7 @@
|
||||
, gcr
|
||||
, libpeas
|
||||
, gtk3
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, sqlite
|
||||
, gsettings-desktop-schemas
|
||||
, libsoup
|
||||
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
libpeas
|
||||
sqlite
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
json-glib
|
||||
libarchive
|
||||
];
|
||||
|
@ -15,7 +15,7 @@
|
||||
, gdk-pixbuf
|
||||
, cairo
|
||||
, pango
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, openssl
|
||||
, gstreamer
|
||||
, gst-libav
|
||||
@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cairo
|
||||
pango
|
||||
gtk3
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
openssl
|
||||
libfixposix
|
||||
];
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchgit
|
||||
, pkg-config, wrapGAppsHook3
|
||||
, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk
|
||||
, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk_4_0
|
||||
, xorg, dmenu, findutils, gnused, coreutils, gst_all_1
|
||||
, patches ? null
|
||||
}:
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
gsettings-desktop-schemas
|
||||
gtk
|
||||
libsoup
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
] ++ (with gst_all_1; [
|
||||
# Audio & video support for webkitgtk WebView
|
||||
gstreamer
|
||||
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://surf.suckless.org";
|
||||
license = licenses.mit;
|
||||
platforms = webkitgtk.meta.platforms;
|
||||
platforms = webkitgtk_4_0.meta.platforms;
|
||||
maintainers = with maintainers; [ joachifm ];
|
||||
};
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk, gtk3, glib-networking
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk_4_0, gtk3, glib-networking
|
||||
, gsettings-desktop-schemas, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook3 pkg-config ];
|
||||
buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ];
|
||||
buildInputs = [ gtk3 libsoup webkitgtk_4_0 glib-networking gsettings-desktop-schemas ];
|
||||
|
||||
passthru = {
|
||||
inherit gtk3;
|
||||
|
@ -18,7 +18,7 @@
|
||||
libxml2,
|
||||
openssl,
|
||||
sqlite,
|
||||
webkitgtk,
|
||||
webkitgtk_6_0,
|
||||
glib-networking,
|
||||
librsvg,
|
||||
gst_all_1,
|
||||
@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libxml2
|
||||
openssl
|
||||
sqlite
|
||||
webkitgtk
|
||||
webkitgtk_6_0
|
||||
|
||||
# TLS support for loading external content in webkitgtk WebView
|
||||
glib-networking
|
||||
|
@ -11,7 +11,7 @@
|
||||
perl,
|
||||
pkg-config,
|
||||
glib,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
libayatana-appindicator,
|
||||
cairo,
|
||||
openssl,
|
||||
@ -88,7 +88,7 @@ in
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
libayatana-appindicator
|
||||
cairo
|
||||
openssl
|
||||
|
@ -8,7 +8,7 @@
|
||||
, wrapGAppsHook4
|
||||
, gtk4
|
||||
, gdk-pixbuf
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, gtksourceview5
|
||||
, glib-networking
|
||||
, libadwaita
|
||||
@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
gtk4
|
||||
gdk-pixbuf
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
gtksourceview5
|
||||
glib-networking
|
||||
libadwaita
|
||||
|
@ -16,7 +16,7 @@
|
||||
, librsvg
|
||||
, libzip
|
||||
, openssl
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, libappindicator-gtk3
|
||||
}:
|
||||
|
||||
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
librsvg
|
||||
libzip
|
||||
openssl
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
libappindicator-gtk3
|
||||
];
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
, pcre
|
||||
, pcre2
|
||||
, pkg-config
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
, xorg
|
||||
}:
|
||||
@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pcre
|
||||
pcre2
|
||||
sqlite
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
xorg.libXdmcp
|
||||
xorg.libXtst
|
||||
];
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk, ronn
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk_4_0, ronn
|
||||
, libsass, notmuch, boost, wrapGAppsHook3, glib-networking, protobuf
|
||||
, gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3
|
||||
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtkmm3 gmime3 webkitgtk libsass libpeas
|
||||
gtkmm3 gmime3 webkitgtk_4_0 libsass libpeas
|
||||
python3
|
||||
notmuch boost gsettings-desktop-schemas adwaita-icon-theme
|
||||
glib-networking protobuf
|
||||
|
@ -18,7 +18,7 @@
|
||||
, openssl
|
||||
, pkg-config
|
||||
, sqlite
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
libsecret
|
||||
openssl
|
||||
sqlite
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
|
@ -31,7 +31,7 @@
|
||||
, enablePluginBsfilter ? true
|
||||
, enablePluginClamd ? true
|
||||
, enablePluginDillo ? true
|
||||
, enablePluginFancy ? true, webkitgtk
|
||||
, enablePluginFancy ? true, webkitgtk_4_0
|
||||
, enablePluginFetchInfo ? true
|
||||
, enablePluginKeywordWarner ? true
|
||||
, enablePluginLibravatar ? enablePluginRavatar
|
||||
@ -67,7 +67,7 @@ let
|
||||
{ flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; }
|
||||
{ flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; }
|
||||
{ flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; }
|
||||
{ flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ webkitgtk ]; }
|
||||
{ flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ webkitgtk_4_0 ]; }
|
||||
{ flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; }
|
||||
{ flags = [ "keyword_warner-plugin" ]; enabled = enablePluginKeywordWarner; }
|
||||
{ flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; }
|
||||
|
@ -8,8 +8,8 @@
|
||||
, libxml2
|
||||
, libxslt
|
||||
, sqlite
|
||||
, libsoup
|
||||
, webkitgtk
|
||||
, libsoup_3
|
||||
, webkitgtk_4_1
|
||||
, json-glib
|
||||
, gst_all_1
|
||||
, libnotify
|
||||
@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
webkitgtk
|
||||
webkitgtk_4_1
|
||||
libxml2
|
||||
libxslt
|
||||
sqlite
|
||||
libsoup
|
||||
libsoup_3
|
||||
libpeas
|
||||
gsettings-desktop-schemas
|
||||
json-glib
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more
|
||||
, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3
|
||||
, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3
|
||||
, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
|
||||
, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
|
||||
, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin
|
||||
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
|
||||
gdk-pixbuf
|
||||
gnome2.gtkglext
|
||||
glib-networking
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
gtk2
|
||||
gtk2-x11
|
||||
gtk3
|
||||
|
@ -16,7 +16,7 @@
|
||||
, json-glib
|
||||
, libappindicator
|
||||
, libsoup
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
json-glib
|
||||
libappindicator
|
||||
libsoup
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -23,7 +23,7 @@
|
||||
, unar
|
||||
, unzip
|
||||
, vala
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
poppler
|
||||
python3
|
||||
sqlite
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -17,7 +17,7 @@
|
||||
, libgee
|
||||
, pantheon
|
||||
, sqlite
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
libgee
|
||||
pantheon.granite
|
||||
sqlite
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gtk3, libxml2, gettext, libical, libnotify
|
||||
, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook3 }:
|
||||
, libarchive, gspell, webkitgtk_4_0, libgringotts, wrapGAppsHook3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmo";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ];
|
||||
buildInputs = [ gtk3 libxml2 libical libnotify libarchive
|
||||
gspell webkitgtk libgringotts ];
|
||||
gspell webkitgtk_4_0 libgringotts ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Handy personal organizer";
|
||||
|
@ -11,7 +11,7 @@
|
||||
, gtksourceview
|
||||
, libgee
|
||||
, nix-update-script
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, libqalculate
|
||||
, intltool
|
||||
, gnuplot
|
||||
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
gtksourceview
|
||||
libgee
|
||||
pantheon.granite
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
# We add libqalculate's runtime dependencies because nasc has it as a modified subproject.
|
||||
] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs;
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, obs-studio
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, glib-networking
|
||||
, meson
|
||||
, cmake
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
obs-studio
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
glib-networking
|
||||
];
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
, glibc
|
||||
, gtk3
|
||||
, libappindicator
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, e2fsprogs
|
||||
, libnotify
|
||||
, libgit2
|
||||
@ -63,7 +63,7 @@ buildDotnetModule {
|
||||
glibc
|
||||
gtk3
|
||||
libappindicator
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
e2fsprogs
|
||||
libnotify
|
||||
libgit2
|
||||
|
@ -20,7 +20,7 @@
|
||||
poppler,
|
||||
stdenv,
|
||||
testers,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libxshmfence # otherwise warnings in compilation
|
||||
pcre
|
||||
poppler
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
@ -11,7 +11,7 @@
|
||||
, gtk3
|
||||
, openssl_1_1
|
||||
, icu70
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, librsvg
|
||||
, gdk-pixbuf
|
||||
, libsoup
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gtk3
|
||||
openssl_1_1.out
|
||||
icu70
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
librsvg
|
||||
gdk-pixbuf
|
||||
libsoup
|
||||
|
@ -9,7 +9,7 @@
|
||||
libsoup,
|
||||
openssl,
|
||||
pkg-config,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
gtk3
|
||||
libsoup
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
|
@ -8,7 +8,7 @@
|
||||
libsoup,
|
||||
openssl,
|
||||
pkg-config,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
glib-networking
|
||||
libsoup
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
|
@ -11,7 +11,7 @@
|
||||
libsoup,
|
||||
fetchzip,
|
||||
openssl_3,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
gdk-pixbuf,
|
||||
pkg-config,
|
||||
makeDesktopItem,
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
curl
|
||||
wget
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
gtk3
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
|
@ -32,7 +32,7 @@
|
||||
, sqlite
|
||||
, stdenv
|
||||
, util-linuxMinimal
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3
|
||||
sqlite
|
||||
util-linuxMinimal
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
@ -32,7 +32,7 @@
|
||||
, python3
|
||||
, sqlite
|
||||
, gcc11Stdenv
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
let
|
||||
# JUCE version in submodules is incompatible with GCC12
|
||||
@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pcre2
|
||||
python3
|
||||
sqlite
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
# Link-time-optimization fails without these
|
||||
|
@ -14,7 +14,7 @@
|
||||
glib,
|
||||
glib-networking,
|
||||
libayatana-appindicator,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -84,7 +84,7 @@ rustPlatform.buildRustPackage rec {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
glib-networking
|
||||
libayatana-appindicator
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.DarwinTools
|
||||
|
@ -5,7 +5,7 @@
|
||||
pkg-config,
|
||||
openssl,
|
||||
pname,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
service-cargo-hash,
|
||||
meta,
|
||||
}:
|
||||
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
env = {
|
||||
|
@ -9,7 +9,7 @@
|
||||
rustPlatform,
|
||||
makeDesktopItem,
|
||||
meta,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
openssl,
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
@ -44,7 +44,7 @@ rustPlatform.buildRustPackage {
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
@ -11,7 +11,7 @@
|
||||
gtk3,
|
||||
swt,
|
||||
glib,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
glib-networking,
|
||||
}:
|
||||
|
||||
@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
swt
|
||||
gtk3
|
||||
glib
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
glib-networking
|
||||
]
|
||||
}"
|
||||
|
@ -7,7 +7,7 @@
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, libsoup
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libsoup
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
@ -7,7 +7,7 @@
|
||||
, gst_all_1
|
||||
, libappindicator
|
||||
, libayatana-appindicator
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
openssl,
|
||||
libsoup,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
gst_all_1,
|
||||
darwin,
|
||||
}:
|
||||
@ -66,7 +66,7 @@ buildRustPackage rec {
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
openssl
|
||||
libsoup
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-bad
|
||||
|
@ -2,7 +2,7 @@
|
||||
lib,
|
||||
flutter324,
|
||||
fetchFromGitHub,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
sqlite,
|
||||
libayatana-appindicator,
|
||||
makeDesktopItem,
|
||||
@ -52,7 +52,7 @@ flutter324.buildFlutterApplication rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
sqlite
|
||||
libayatana-appindicator
|
||||
];
|
||||
|
@ -20,7 +20,7 @@
|
||||
, wrapGAppsHook4
|
||||
, gobject-introspection
|
||||
# withWebkit enables the "webkit" feature, also known as Google Fonts
|
||||
, withWebkit ? true, glib-networking, libsoup, webkitgtk
|
||||
, withWebkit ? true, glib-networking, libsoup_3, webkitgtk_6_0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
|
||||
adwaita-icon-theme
|
||||
] ++ lib.optionals withWebkit [
|
||||
glib-networking # for SSL so that Google Fonts can load
|
||||
libsoup
|
||||
webkitgtk
|
||||
libsoup_3
|
||||
webkitgtk_6_0
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
@ -19,7 +19,7 @@
|
||||
moreutils,
|
||||
openssl,
|
||||
rust,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
nix-update-script,
|
||||
cacert,
|
||||
}:
|
||||
@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
glib-networking
|
||||
libsoup
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
|
@ -19,7 +19,7 @@
|
||||
libuuid,
|
||||
curl,
|
||||
libhandy,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
gnome,
|
||||
adwaita-icon-theme,
|
||||
libxml2,
|
||||
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||
libuuid
|
||||
curl
|
||||
libhandy
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
tracker
|
||||
gnome-online-accounts
|
||||
gsettings-desktop-schemas
|
||||
|
@ -22,7 +22,7 @@
|
||||
, perlPackages
|
||||
, pkg-config
|
||||
, swig
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
libxml2
|
||||
libxslt
|
||||
swig
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
]
|
||||
++ (with perlPackages; [
|
||||
JSONParse
|
||||
|
@ -6,7 +6,7 @@
|
||||
openssl,
|
||||
pkg-config,
|
||||
perl,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [
|
||||
libsoup
|
||||
openssl
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -3,7 +3,7 @@
|
||||
, dpkg
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
@ -7,7 +7,7 @@
|
||||
, curlMinimal
|
||||
, openssl
|
||||
, libsecret
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, libsoup
|
||||
, gtk3
|
||||
, atk
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
curlMinimal
|
||||
openssl
|
||||
libsecret
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
libsoup
|
||||
gtk3
|
||||
atk
|
||||
|
@ -8,7 +8,7 @@
|
||||
, desktop-file-utils
|
||||
, openssl
|
||||
, libayatana-appindicator
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, pkg-config
|
||||
, pnpm
|
||||
, nodejs
|
||||
@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
openssl
|
||||
libayatana-appindicator
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
|
@ -2,7 +2,7 @@
|
||||
dbus,
|
||||
openssl,
|
||||
gtk3,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
fetchFromGitHub,
|
||||
@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec {
|
||||
gtk3
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
alsa-lib
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
|
@ -9,7 +9,7 @@
|
||||
nspr,
|
||||
alsa-lib,
|
||||
openssl,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
udev,
|
||||
libayatana-appindicator,
|
||||
libGL,
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation {
|
||||
nspr
|
||||
alsa-lib
|
||||
openssl
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
stdenv.cc.cc.lib
|
||||
];
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
nodejs,
|
||||
openssl,
|
||||
pkg-config,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "modrinth-app-unwrapped";
|
||||
@ -87,7 +87,7 @@ rustPlatform.buildRustPackage {
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libsoup
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
|
@ -18,7 +18,7 @@
|
||||
libevdev,
|
||||
gtk3,
|
||||
libsoup,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Tauri deps
|
||||
gtk3
|
||||
libsoup
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
|
@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
curl,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
libmicrohttpd,
|
||||
libsecret,
|
||||
qrencode,
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
libmicrohttpd
|
||||
libsecret
|
||||
qrencode
|
||||
|
@ -5,7 +5,7 @@
|
||||
pkg-config,
|
||||
openssl,
|
||||
libsoup,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
fetchFromGitHub,
|
||||
libayatana-appindicator,
|
||||
}:
|
||||
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
libsoup
|
||||
];
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
openjdk17,
|
||||
stdenvNoCC,
|
||||
swt,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
wrapGAppsHook3,
|
||||
gitUpdater,
|
||||
}:
|
||||
@ -30,7 +30,7 @@ let
|
||||
gtk3
|
||||
libsecret
|
||||
swt
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
@ -14,7 +14,7 @@
|
||||
buildGoModule,
|
||||
libayatana-appindicator,
|
||||
gtk3,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
libsoup,
|
||||
openssl,
|
||||
xdotool,
|
||||
@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libsoup
|
||||
libayatana-appindicator
|
||||
openssl
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
xdotool
|
||||
];
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
, installShellFiles
|
||||
, xorg
|
||||
, gtk3
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, snippetexpanderd
|
||||
, snippetexpanderx
|
||||
}:
|
||||
@ -32,7 +32,7 @@ buildGoModule rec {
|
||||
buildInputs = [
|
||||
xorg.libX11
|
||||
gtk3
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
snippetexpanderd
|
||||
snippetexpanderx
|
||||
];
|
||||
|
@ -4,7 +4,7 @@
|
||||
freetype,
|
||||
libsoup,
|
||||
gtk3,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
parallel-disk-usage,
|
||||
@ -66,7 +66,7 @@ in
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [pkg-config wrapGAppsHook3 copyDesktopItems];
|
||||
buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk];
|
||||
buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk_4_0];
|
||||
|
||||
# Disable checkPhase, since the project doesn't contain tests
|
||||
doCheck = false;
|
||||
|
@ -15,7 +15,7 @@
|
||||
, openssl
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
, sqlite
|
||||
}:
|
||||
@ -97,7 +97,7 @@ rustPlatform.buildRustPackage {
|
||||
freetype
|
||||
libsoup
|
||||
gtk3
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
gsettings-desktop-schemas
|
||||
sqlite
|
||||
];
|
||||
|
@ -22,7 +22,7 @@
|
||||
, minizip
|
||||
, pkg-config
|
||||
, sword
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, wrapGAppsHook3
|
||||
, yelp-tools
|
||||
, zip
|
||||
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
|
||||
libuuid
|
||||
minizip
|
||||
sword
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
@ -139,7 +139,7 @@ in
|
||||
addToNativeBuildInputs pkgs.taglib old
|
||||
);
|
||||
uuid-lib = addToBuildInputs pkgs.libuuid;
|
||||
webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk;
|
||||
webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk_4_0;
|
||||
ws-client = addToBuildInputs pkgs.zlib;
|
||||
xlib = addToPropagatedBuildInputs pkgs.xorg.libX11;
|
||||
yaml = addToBuildInputs pkgs.libyaml;
|
||||
|
@ -124113,7 +124113,7 @@ self: {
|
||||
"gi-javascriptcore" = callPackage
|
||||
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
|
||||
, gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
|
||||
, text, transformers, webkitgtk
|
||||
, text, transformers, webkitgtk_4_0
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "gi-javascriptcore";
|
||||
@ -124124,11 +124124,11 @@ self: {
|
||||
base bytestring containers gi-glib gi-gobject haskell-gi
|
||||
haskell-gi-base haskell-gi-overloading text transformers
|
||||
];
|
||||
libraryPkgconfigDepends = [ webkitgtk ];
|
||||
libraryPkgconfigDepends = [ webkitgtk_4_0 ];
|
||||
description = "JavaScriptCore bindings";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
}) {inherit (pkgs) webkitgtk;};
|
||||
}) {inherit (pkgs) webkitgtk_4_0;};
|
||||
|
||||
"gi-javascriptcore_6_0_4" = callPackage
|
||||
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
|
||||
@ -124469,7 +124469,7 @@ self: {
|
||||
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
|
||||
, gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk
|
||||
, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
|
||||
, haskell-gi-overloading, text, transformers, webkitgtk
|
||||
, haskell-gi-overloading, text, transformers, webkitgtk_4_0
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "gi-webkit";
|
||||
@ -124484,17 +124484,17 @@ self: {
|
||||
gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi
|
||||
haskell-gi-base haskell-gi-overloading text transformers
|
||||
];
|
||||
libraryPkgconfigDepends = [ webkitgtk ];
|
||||
libraryPkgconfigDepends = [ webkitgtk_4_0 ];
|
||||
description = "WebKit bindings";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {inherit (pkgs) webkitgtk;};
|
||||
}) {inherit (pkgs) webkitgtk_4_0;};
|
||||
|
||||
"gi-webkit2" = callPackage
|
||||
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
|
||||
, gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk
|
||||
, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
|
||||
, haskell-gi-overloading, text, transformers, webkitgtk
|
||||
, haskell-gi-overloading, text, transformers, webkitgtk_4_0
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "gi-webkit2";
|
||||
@ -124509,17 +124509,17 @@ self: {
|
||||
gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi
|
||||
haskell-gi-base haskell-gi-overloading text transformers
|
||||
];
|
||||
libraryPkgconfigDepends = [ webkitgtk ];
|
||||
libraryPkgconfigDepends = [ webkitgtk_4_0 ];
|
||||
description = "WebKit2 bindings";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
}) {inherit (pkgs) webkitgtk;};
|
||||
}) {inherit (pkgs) webkitgtk_4_0;};
|
||||
|
||||
"gi-webkit2webextension" = callPackage
|
||||
({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk
|
||||
, gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup
|
||||
, haskell-gi, haskell-gi-base, haskell-gi-overloading, text
|
||||
, transformers, webkitgtk
|
||||
, transformers, webkitgtk_4_0
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "gi-webkit2webextension";
|
||||
@ -124534,13 +124534,13 @@ self: {
|
||||
gi-javascriptcore gi-soup haskell-gi haskell-gi-base
|
||||
haskell-gi-overloading text transformers
|
||||
];
|
||||
libraryPkgconfigDepends = [ webkitgtk ];
|
||||
libraryPkgconfigDepends = [ webkitgtk_4_0 ];
|
||||
description = "WebKit2-WebExtension bindings";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {inherit (pkgs) webkitgtk;};
|
||||
}) {inherit (pkgs) webkitgtk_4_0;};
|
||||
|
||||
"gi-webkitwebprocessextension" = callPackage
|
||||
({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk
|
||||
@ -309518,7 +309518,7 @@ self: {
|
||||
, gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens
|
||||
, mime-types, mtl, network, process, random, scientific, split
|
||||
, tasty, tasty-quickcheck, text, transformers, unordered-containers
|
||||
, utf8-string, vector, webkitgtk, xdg-basedir, xmonad
|
||||
, utf8-string, vector, webkitgtk_4_0, xdg-basedir, xmonad
|
||||
, xmonad-contrib
|
||||
}:
|
||||
mkDerivation {
|
||||
@ -309537,7 +309537,7 @@ self: {
|
||||
mime-types mtl network process random scientific split text
|
||||
transformers unordered-containers utf8-string vector xdg-basedir
|
||||
];
|
||||
executablePkgconfigDepends = [ gtk3 webkitgtk ];
|
||||
executablePkgconfigDepends = [ gtk3 webkitgtk_4_0 ];
|
||||
testHaskellDepends = [
|
||||
aeson base bytestring containers dbus directory filepath gi-gdk
|
||||
gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens
|
||||
@ -309550,7 +309550,7 @@ self: {
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "tianbar";
|
||||
broken = true;
|
||||
}) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;};
|
||||
}) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk_4_0;};
|
||||
|
||||
"tibetan-utils" = callPackage
|
||||
({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec
|
||||
@ -332056,30 +332056,30 @@ self: {
|
||||
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
|
||||
libraryHaskellDepends = [ base ];
|
||||
libraryPkgconfigDepends = [ webkit ];
|
||||
description = "JavaScriptCore FFI from webkitgtk";
|
||||
description = "JavaScriptCore FFI from webkitgtk_4_0";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {webkit = null;};
|
||||
|
||||
"webkit2gtk3-javascriptcore" = callPackage
|
||||
({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }:
|
||||
({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }:
|
||||
mkDerivation {
|
||||
pname = "webkit2gtk3-javascriptcore";
|
||||
version = "0.14.4.6";
|
||||
sha256 = "06g9ik2pzv761bj5kas17jxh6wxks3dd4vvrimliybs5s5b61b24";
|
||||
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
|
||||
libraryHaskellDepends = [ base ];
|
||||
libraryPkgconfigDepends = [ webkitgtk ];
|
||||
description = "JavaScriptCore FFI from webkitgtk";
|
||||
libraryPkgconfigDepends = [ webkitgtk_4_0 ];
|
||||
description = "JavaScriptCore FFI from webkitgtk_4_0";
|
||||
license = lib.licenses.bsd3;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
}) {inherit (pkgs) webkitgtk;};
|
||||
}) {inherit (pkgs) webkitgtk_4_0;};
|
||||
|
||||
"webkitgtk3" = callPackage
|
||||
({ mkDerivation, base, bytestring, Cabal, cairo, glib
|
||||
, gtk2hs-buildtools, gtk3, mtl, pango, text, transformers
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "webkitgtk3";
|
||||
@ -332090,27 +332090,27 @@ self: {
|
||||
libraryHaskellDepends = [
|
||||
base bytestring cairo glib gtk3 mtl pango text transformers
|
||||
];
|
||||
libraryPkgconfigDepends = [ webkitgtk ];
|
||||
libraryPkgconfigDepends = [ webkitgtk_4_0 ];
|
||||
libraryToolDepends = [ gtk2hs-buildtools ];
|
||||
description = "Binding to the Webkit library";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {inherit (pkgs) webkitgtk;};
|
||||
}) {inherit (pkgs) webkitgtk_4_0;};
|
||||
|
||||
"webkitgtk3-javascriptcore" = callPackage
|
||||
({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }:
|
||||
({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }:
|
||||
mkDerivation {
|
||||
pname = "webkitgtk3-javascriptcore";
|
||||
version = "0.14.2.1";
|
||||
sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j";
|
||||
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
|
||||
libraryHaskellDepends = [ base ];
|
||||
libraryPkgconfigDepends = [ webkitgtk ];
|
||||
description = "JavaScriptCore FFI from webkitgtk";
|
||||
libraryPkgconfigDepends = [ webkitgtk_4_0 ];
|
||||
description = "JavaScriptCore FFI from webkitgtk_4_0";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {inherit (pkgs) webkitgtk;};
|
||||
}) {inherit (pkgs) webkitgtk_4_0;};
|
||||
|
||||
"webmention" = callPackage
|
||||
({ mkDerivation, base, bytestring, case-insensitive, either
|
||||
|
@ -6,7 +6,7 @@
|
||||
, gtk3-x11
|
||||
, pcre
|
||||
, pkg-config
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, xorg
|
||||
, WebKit
|
||||
, MetalKit
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
xorg.libX11
|
||||
xorg.libXrandr
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
WebKit
|
||||
MetalKit
|
||||
|
@ -20,7 +20,7 @@
|
||||
, withEGL ? true
|
||||
, withMesa ? !stdenv.hostPlatform.isDarwin
|
||||
, withWebKit ? stdenv.hostPlatform.isDarwin
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, setfile
|
||||
, AGL
|
||||
, Carbon
|
||||
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optional withCurl curl
|
||||
++ lib.optional withMesa libGLU
|
||||
++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk
|
||||
++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0
|
||||
++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
setfile
|
||||
|
@ -22,7 +22,7 @@
|
||||
, unicode ? true
|
||||
, withMesa ? !stdenv.hostPlatform.isDarwin
|
||||
, withWebKit ? true
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, setfile
|
||||
, AGL
|
||||
, Carbon
|
||||
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
xorgproto
|
||||
]
|
||||
++ lib.optional withMesa libGLU
|
||||
++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk
|
||||
++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0
|
||||
++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
expat
|
||||
|
@ -65,7 +65,7 @@ let
|
||||
nativeLibs = [ pkgs.sqlite ];
|
||||
});
|
||||
cl-webkit2 = super.cl-webkit2.overrideLispAttrs (o: {
|
||||
nativeLibs = [ pkgs.webkitgtk ];
|
||||
nativeLibs = [ pkgs.webkitgtk_4_0 ];
|
||||
});
|
||||
dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: {
|
||||
nativeLibs = [ pkgs.mariadb.client ];
|
||||
|
@ -13,7 +13,7 @@
|
||||
, freetype
|
||||
, curl
|
||||
, libglvnd
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, pcre
|
||||
, darwin
|
||||
}:
|
||||
@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib # libasound.so
|
||||
libglvnd # libGL.so
|
||||
webkitgtk # webkit2gtk-4.0
|
||||
webkitgtk_4_0 # webkit2gtk-4.0
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
darwin.apple_sdk.frameworks.MetalKit
|
||||
|
@ -30,7 +30,7 @@
|
||||
mesa,
|
||||
pango,
|
||||
SDL,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
wxGTK,
|
||||
xorgproto,
|
||||
|
||||
@ -93,7 +93,7 @@ buildPythonPackage rec {
|
||||
libXxf86vm
|
||||
libglvnd
|
||||
mesa
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
xorgproto
|
||||
];
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
, rustPlatform
|
||||
, stdenv
|
||||
, testers
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
}:
|
||||
|
||||
let
|
||||
@ -146,7 +146,7 @@ rec {
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
gtk3
|
||||
libayatana-appindicator
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Carbon
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
|
@ -14,7 +14,7 @@
|
||||
, shared-mime-info
|
||||
, stdenv
|
||||
, unzip
|
||||
, webkitgtk
|
||||
, webkitgtk_4_0
|
||||
, zlib
|
||||
}:
|
||||
|
||||
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
|
||||
# Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/<version>
|
||||
makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \
|
||||
--prefix PATH : ${jdk}/bin \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_0 ])} \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration"
|
||||
|
||||
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
|
||||
libXtst
|
||||
zlib
|
||||
shared-mime-info
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user