treewide: update to webkitgtk_4_1 where possible
Methodology: - `sed` to find and replace in pkgs/* - exclude pkgs/top-level - nixpkgs-review on x86_64-linux and aarch64-linux - revert everything that doesn't build - revert everything that doesn't launch [x86_64-linux] - check upstream source whether the change makes sense [free software only]
This commit is contained in:
parent
96f6f921c2
commit
cd062f040e
@ -14,7 +14,7 @@
|
|||||||
libXtst,
|
libXtst,
|
||||||
libsecret,
|
libsecret,
|
||||||
gsettings-desktop-schemas,
|
gsettings-desktop-schemas,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
perl,
|
perl,
|
||||||
...
|
...
|
||||||
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||||||
libXtst
|
libXtst
|
||||||
libsecret
|
libsecret
|
||||||
zlib
|
zlib
|
||||||
] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0;
|
] ++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1;
|
||||||
|
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
# Unpack tarball.
|
# Unpack tarball.
|
||||||
@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
|
|||||||
libXtst
|
libXtst
|
||||||
libsecret
|
libsecret
|
||||||
]
|
]
|
||||||
++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0
|
++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1
|
||||||
)
|
)
|
||||||
} \
|
} \
|
||||||
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
|
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
jdk,
|
jdk,
|
||||||
jdk8,
|
jdk8,
|
||||||
gsettings-desktop-schemas,
|
gsettings-desktop-schemas,
|
||||||
webkitgtk_4_0 ? null, # for internal web browser
|
webkitgtk_4_1 ? null, # for internal web browser
|
||||||
buildEnv,
|
buildEnv,
|
||||||
runCommand,
|
runCommand,
|
||||||
callPackage,
|
callPackage,
|
||||||
@ -64,7 +64,7 @@ let
|
|||||||
gtk
|
gtk
|
||||||
libXtst
|
libXtst
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
makeWrapper
|
makeWrapper
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
gtkspell3,
|
gtkspell3,
|
||||||
librsvg,
|
librsvg,
|
||||||
pygobject3,
|
pygobject3,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
@ -37,7 +37,7 @@ buildPythonApplication rec {
|
|||||||
gtkspell3
|
gtkspell3
|
||||||
librsvg
|
librsvg
|
||||||
pygobject3
|
pygobject3
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
];
|
];
|
||||||
|
|
||||||
# Needs a display
|
# Needs a display
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
gtk3,
|
gtk3,
|
||||||
gtksourceview,
|
gtksourceview,
|
||||||
pango,
|
pango,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
pygobject3,
|
pygobject3,
|
||||||
pyyaml,
|
pyyaml,
|
||||||
setuptools,
|
setuptools,
|
||||||
@ -39,7 +39,7 @@ buildPythonApplication rec {
|
|||||||
gtk3
|
gtk3
|
||||||
gtksourceview
|
gtksourceview
|
||||||
pango
|
pango
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
pygobject3
|
pygobject3
|
||||||
pyyaml
|
pyyaml
|
||||||
];
|
];
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
gtk3,
|
gtk3,
|
||||||
libnotify,
|
libnotify,
|
||||||
pango,
|
pango,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
|
|
||||||
# check inputs
|
# check inputs
|
||||||
@ -96,7 +96,7 @@ buildPythonApplication rec {
|
|||||||
gtk3
|
gtk3
|
||||||
libnotify
|
libnotify
|
||||||
pango
|
pango
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
]
|
]
|
||||||
++ (with gst_all_1; [
|
++ (with gst_all_1; [
|
||||||
gst-libav
|
gst-libav
|
||||||
|
@ -21,7 +21,7 @@ let
|
|||||||
gtksourceview
|
gtksourceview
|
||||||
gnome-desktop
|
gnome-desktop
|
||||||
libgnome-keyring
|
libgnome-keyring
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
];
|
];
|
||||||
xorgDeps =
|
xorgDeps =
|
||||||
pkgs: with pkgs.xorg; [
|
pkgs: with pkgs.xorg; [
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
gdk-pixbuf,
|
gdk-pixbuf,
|
||||||
cairo,
|
cairo,
|
||||||
pango,
|
pango,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
openssl,
|
openssl,
|
||||||
gstreamer,
|
gstreamer,
|
||||||
gst-libav,
|
gst-libav,
|
||||||
@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
cairo
|
cairo
|
||||||
pango
|
pango
|
||||||
gtk3
|
gtk3
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
openssl
|
openssl
|
||||||
libfixposix
|
libfixposix
|
||||||
];
|
];
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
obs-studio,
|
obs-studio,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
glib-networking,
|
glib-networking,
|
||||||
meson,
|
meson,
|
||||||
cmake,
|
cmake,
|
||||||
@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
obs-studio
|
obs-studio
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
glib-networking
|
glib-networking
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
glib,
|
glib,
|
||||||
libsecret,
|
libsecret,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
|
|||||||
--prefix LD_LIBRARY_PATH : ${
|
--prefix LD_LIBRARY_PATH : ${
|
||||||
lib.makeLibraryPath [
|
lib.makeLibraryPath [
|
||||||
glib
|
glib
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
]
|
]
|
||||||
} \
|
} \
|
||||||
--run "mkdir -p /tmp/SWT-GDBusServer"
|
--run "mkdir -p /tmp/SWT-GDBusServer"
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
poppler,
|
poppler,
|
||||||
stdenv,
|
stdenv,
|
||||||
testers,
|
testers,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
libxshmfence # otherwise warnings in compilation
|
libxshmfence # otherwise warnings in compilation
|
||||||
pcre
|
pcre
|
||||||
poppler
|
poppler
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
];
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
jdk,
|
jdk,
|
||||||
libsecret,
|
libsecret,
|
||||||
glib,
|
glib,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
_7zz,
|
_7zz,
|
||||||
nixosTests,
|
nixosTests,
|
||||||
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
|
|||||||
--prefix LD_LIBRARY_PATH : ${
|
--prefix LD_LIBRARY_PATH : ${
|
||||||
lib.makeLibraryPath ([
|
lib.makeLibraryPath ([
|
||||||
glib
|
glib
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
])
|
])
|
||||||
} \
|
} \
|
||||||
--set WEBKIT_DISABLE_DMABUF_RENDERER 1 \
|
--set WEBKIT_DISABLE_DMABUF_RENDERER 1 \
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
xcbutilkeysyms,
|
xcbutilkeysyms,
|
||||||
xcb-util-cursor,
|
xcb-util-cursor,
|
||||||
gtk3,
|
gtk3,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
python3,
|
python3,
|
||||||
curl,
|
curl,
|
||||||
pcre,
|
pcre,
|
||||||
@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
libXScrnSaver
|
libXScrnSaver
|
||||||
curl
|
curl
|
||||||
gtk3
|
gtk3
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
freetype
|
freetype
|
||||||
libGL
|
libGL
|
||||||
libusb1
|
libusb1
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
lib,
|
lib,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
appimageTools,
|
appimageTools,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
pname = "bitcomet";
|
pname = "bitcomet";
|
||||||
@ -20,7 +20,7 @@ appimageTools.wrapType2 {
|
|||||||
pkgs: with pkgs; [
|
pkgs: with pkgs; [
|
||||||
libxml2
|
libxml2
|
||||||
libpng
|
libpng
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
];
|
];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
enablePluginClamd ? true,
|
enablePluginClamd ? true,
|
||||||
enablePluginDillo ? true,
|
enablePluginDillo ? true,
|
||||||
enablePluginFancy ? true,
|
enablePluginFancy ? true,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
enablePluginFetchInfo ? true,
|
enablePluginFetchInfo ? true,
|
||||||
enablePluginKeywordWarner ? true,
|
enablePluginKeywordWarner ? true,
|
||||||
enablePluginLibravatar ? enablePluginRavatar,
|
enablePluginLibravatar ? enablePluginRavatar,
|
||||||
@ -147,7 +147,7 @@ let
|
|||||||
{
|
{
|
||||||
flags = [ "fancy-plugin" ];
|
flags = [ "fancy-plugin" ];
|
||||||
enabled = enablePluginFancy;
|
enabled = enablePluginFancy;
|
||||||
deps = [ webkitgtk_4_0 ];
|
deps = [ webkitgtk_4_1 ];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
flags = [ "fetchinfo-plugin" ];
|
flags = [ "fetchinfo-plugin" ];
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
gtk3,
|
gtk3,
|
||||||
glib,
|
glib,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
glib-networking,
|
glib-networking,
|
||||||
override_xmx ? "1024m",
|
override_xmx ? "1024m",
|
||||||
}:
|
}:
|
||||||
@ -83,7 +83,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||||||
lib.makeLibraryPath [
|
lib.makeLibraryPath [
|
||||||
gtk3
|
gtk3
|
||||||
glib
|
glib
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
glib-networking
|
glib-networking
|
||||||
]
|
]
|
||||||
}"
|
}"
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
shared-mime-info,
|
shared-mime-info,
|
||||||
stdenv,
|
stdenv,
|
||||||
unzip,
|
unzip,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
zlib,
|
zlib,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
|||||||
glib
|
glib
|
||||||
gtk3
|
gtk3
|
||||||
libXtst
|
libXtst
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
])
|
])
|
||||||
} \
|
} \
|
||||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||||
@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
|
|||||||
libXtst
|
libXtst
|
||||||
zlib
|
zlib
|
||||||
shared-mime-info
|
shared-mime-info
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
];
|
];
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
lib,
|
lib,
|
||||||
flutter324,
|
flutter324,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
sqlite,
|
sqlite,
|
||||||
libayatana-appindicator,
|
libayatana-appindicator,
|
||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
@ -48,7 +48,7 @@ flutter324.buildFlutterApplication rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
sqlite
|
sqlite
|
||||||
libayatana-appindicator
|
libayatana-appindicator
|
||||||
];
|
];
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
librsvg,
|
librsvg,
|
||||||
streamripper,
|
streamripper,
|
||||||
udisks,
|
udisks,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
iconTheme ? adwaita-icon-theme,
|
iconTheme ? adwaita-icon-theme,
|
||||||
deviceDetectionSupport ? true,
|
deviceDetectionSupport ? true,
|
||||||
documentationSupport ? true,
|
documentationSupport ? true,
|
||||||
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
|
|||||||
++ lib.optional multimediaKeySupport keybinder3
|
++ lib.optional multimediaKeySupport keybinder3
|
||||||
++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs
|
++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs
|
||||||
++ lib.optional podcastSupport python3.pkgs.feedparser
|
++ lib.optional podcastSupport python3.pkgs.feedparser
|
||||||
++ lib.optional wikipediaSupport webkitgtk_4_0;
|
++ lib.optional wikipediaSupport webkitgtk_4_1;
|
||||||
|
|
||||||
nativeCheckInputs = with python3.pkgs; [
|
nativeCheckInputs = with python3.pkgs; [
|
||||||
pytest
|
pytest
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
wrapGAppsHook4,
|
wrapGAppsHook4,
|
||||||
gtk4,
|
gtk4,
|
||||||
gdk-pixbuf,
|
gdk-pixbuf,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
gtksourceview5,
|
gtksourceview5,
|
||||||
glib-networking,
|
glib-networking,
|
||||||
libadwaita,
|
libadwaita,
|
||||||
@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
gtk4
|
gtk4
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
gtksourceview5
|
gtksourceview5
|
||||||
glib-networking
|
glib-networking
|
||||||
libadwaita
|
libadwaita
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
nspr,
|
nspr,
|
||||||
alsa-lib,
|
alsa-lib,
|
||||||
openssl,
|
openssl,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
udev,
|
udev,
|
||||||
libayatana-appindicator,
|
libayatana-appindicator,
|
||||||
libGL,
|
libGL,
|
||||||
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||||||
nspr
|
nspr
|
||||||
alsa-lib
|
alsa-lib
|
||||||
openssl
|
openssl
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
(lib.getLib stdenv.cc.cc)
|
(lib.getLib stdenv.cc.cc)
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
steam-run,
|
steam-run,
|
||||||
replaceVars,
|
replaceVars,
|
||||||
unzip,
|
unzip,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec {
|
|||||||
pythonPath = [
|
pythonPath = [
|
||||||
python3Packages.pygobject3
|
python3Packages.pygobject3
|
||||||
python3Packages.requests
|
python3Packages.requests
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
];
|
];
|
||||||
|
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
libnotify,
|
libnotify,
|
||||||
libarchive,
|
libarchive,
|
||||||
gspell,
|
gspell,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
libgringotts,
|
libgringotts,
|
||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
}:
|
}:
|
||||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||||||
libnotify
|
libnotify
|
||||||
libarchive
|
libarchive
|
||||||
gspell
|
gspell
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
libgringotts
|
libgringotts
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
pkg-config,
|
pkg-config,
|
||||||
alsa-lib,
|
alsa-lib,
|
||||||
freetype,
|
freetype,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
zenity,
|
zenity,
|
||||||
curl,
|
curl,
|
||||||
xorg,
|
xorg,
|
||||||
@ -23,7 +23,6 @@
|
|||||||
libxkbcommon,
|
libxkbcommon,
|
||||||
libdatrie,
|
libdatrie,
|
||||||
libepoxy,
|
libepoxy,
|
||||||
libsoup_2_4,
|
|
||||||
libGL,
|
libGL,
|
||||||
libjack2,
|
libjack2,
|
||||||
lerc,
|
lerc,
|
||||||
@ -60,7 +59,7 @@ stdenv.mkDerivation {
|
|||||||
alsa-lib
|
alsa-lib
|
||||||
curl
|
curl
|
||||||
freetype
|
freetype
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
xorg.libX11
|
xorg.libX11
|
||||||
xorg.libXcursor
|
xorg.libXcursor
|
||||||
xorg.libXext
|
xorg.libXext
|
||||||
@ -80,7 +79,6 @@ stdenv.mkDerivation {
|
|||||||
libxkbcommon
|
libxkbcommon
|
||||||
libdatrie
|
libdatrie
|
||||||
libepoxy
|
libepoxy
|
||||||
libsoup_2_4
|
|
||||||
lerc
|
lerc
|
||||||
libjack2
|
libjack2
|
||||||
expat
|
expat
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
openjdk21,
|
openjdk21,
|
||||||
stdenvNoCC,
|
stdenvNoCC,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
gitUpdater,
|
gitUpdater,
|
||||||
}:
|
}:
|
||||||
@ -28,7 +28,7 @@ let
|
|||||||
glib-networking
|
glib-networking
|
||||||
gtk3
|
gtk3
|
||||||
libsecret
|
libsecret
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
libGL,
|
libGL,
|
||||||
libjack2,
|
libjack2,
|
||||||
curl,
|
curl,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
libsysprof-capture,
|
libsysprof-capture,
|
||||||
pcre2,
|
pcre2,
|
||||||
util-linux,
|
util-linux,
|
||||||
@ -23,7 +23,6 @@
|
|||||||
libxkbcommon,
|
libxkbcommon,
|
||||||
libdatrie,
|
libdatrie,
|
||||||
libepoxy,
|
libepoxy,
|
||||||
libsoup_2_4,
|
|
||||||
lerc,
|
lerc,
|
||||||
sqlite,
|
sqlite,
|
||||||
ninja,
|
ninja,
|
||||||
@ -89,11 +88,10 @@ stdenv.mkDerivation {
|
|||||||
libxkbcommon
|
libxkbcommon
|
||||||
libdatrie
|
libdatrie
|
||||||
libepoxy
|
libepoxy
|
||||||
libsoup_2_4
|
|
||||||
lerc
|
lerc
|
||||||
freetype
|
freetype
|
||||||
curl
|
curl
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
pcre2
|
pcre2
|
||||||
util-linux
|
util-linux
|
||||||
sqlite
|
sqlite
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
gobject-introspection,
|
gobject-introspection,
|
||||||
gtk3,
|
gtk3,
|
||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
libnotify,
|
libnotify,
|
||||||
keybinder3,
|
keybinder3,
|
||||||
libappindicator,
|
libappindicator,
|
||||||
@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec {
|
|||||||
libappindicator
|
libappindicator
|
||||||
libnotify
|
libnotify
|
||||||
librsvg
|
librsvg
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
wmctrl
|
wmctrl
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
pcre,
|
pcre,
|
||||||
pcre2,
|
pcre2,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
xorg,
|
xorg,
|
||||||
}:
|
}:
|
||||||
@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
pcre
|
pcre
|
||||||
pcre2
|
pcre2
|
||||||
sqlite
|
sqlite
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
xorg.libXdmcp
|
xorg.libXdmcp
|
||||||
xorg.libXtst
|
xorg.libXtst
|
||||||
];
|
];
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
gtk3-x11,
|
gtk3-x11,
|
||||||
pcre,
|
pcre,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
xorg,
|
xorg,
|
||||||
WebKit,
|
WebKit,
|
||||||
MetalKit,
|
MetalKit,
|
||||||
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||||||
xorg.libXrandr
|
xorg.libXrandr
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
webkitgtk_4_0
|
webkitgtk_4_1
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
WebKit
|
WebKit
|
||||||
|
@ -75,7 +75,7 @@ let
|
|||||||
nativeLibs = [ pkgs.sqlite ];
|
nativeLibs = [ pkgs.sqlite ];
|
||||||
});
|
});
|
||||||
cl-webkit2 = super.cl-webkit2.overrideLispAttrs (o: {
|
cl-webkit2 = super.cl-webkit2.overrideLispAttrs (o: {
|
||||||
nativeLibs = [ pkgs.webkitgtk_4_0 ];
|
nativeLibs = [ pkgs.webkitgtk_4_1 ];
|
||||||
});
|
});
|
||||||
dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: {
|
dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: {
|
||||||
nativeLibs = [ pkgs.mariadb.client ];
|
nativeLibs = [ pkgs.mariadb.client ];
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
freetype,
|
freetype,
|
||||||
curl,
|
curl,
|
||||||
libglvnd,
|
libglvnd,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
pcre2,
|
pcre2,
|
||||||
libsysprof-capture,
|
libsysprof-capture,
|
||||||
util-linuxMinimal,
|
util-linuxMinimal,
|
||||||
@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
alsa-lib # libasound.so
|
alsa-lib # libasound.so
|
||||||
libglvnd # libGL.so
|
libglvnd # libGL.so
|
||||||
webkitgtk_4_0 # webkit2gtk-4.0
|
webkitgtk_4_1 # webkit2gtk-4.0
|
||||||
util-linuxMinimal
|
util-linuxMinimal
|
||||||
libselinux
|
libselinux
|
||||||
libsepol
|
libsepol
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
webkitgtk_4_0,
|
webkitgtk_4_1,
|
||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
glib-networking,
|
glib-networking,
|
||||||
gobject-introspection,
|
gobject-introspection,
|
||||||
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
|||||||
requests
|
requests
|
||||||
pygobject3
|
pygobject3
|
||||||
openconnect
|
openconnect
|
||||||
] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_0;
|
] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
gappsWrapperArgs+=(
|
gappsWrapperArgs+=(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user