Unverified Commit f152a2d1 authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

webkitgtk: refactor top-level to deprecate default ABI version (#345611)

parents b375b0b4 b9a93b63
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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
+2 −2
Original line number Diff line number Diff line
{ 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
+2 −2
Original line number Diff line number Diff line
@@ -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
+2 −2
Original line number Diff line number Diff line
@@ -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) (
+2 −2
Original line number Diff line number Diff line
{ 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"
Loading