From d3ff902e946aa7eed206332c14b7caad06ee233d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 5 Mar 2019 17:40:00 +0100 Subject: [PATCH] webkit: move to aliases --- pkgs/applications/networking/browsers/uzbl/default.nix | 4 ++-- pkgs/applications/networking/browsers/vimb/default.nix | 4 ++-- .../networking/browsers/vimprobable2/default.nix | 4 ++-- pkgs/applications/office/gnucash/default.nix | 4 ++-- pkgs/applications/science/misc/openmodelica/default.nix | 4 ++-- pkgs/development/libraries/java/swt/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 ++---- pkgs/top-level/release-small.nix | 2 +- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 12cf108355c..1d08895f1b0 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, python3, makeWrapper -, webkit, glib-networking, gsettings-desktop-schemas, python2Packages +, webkitgtk, glib-networking, gsettings-desktop-schemas, python2Packages }: # This package needs python3 during buildtime, # but Python 2 + packages during runtime. @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3 makeWrapper ]; - buildInputs = [ gsettings-desktop-schemas webkit ]; + buildInputs = [ gsettings-desktop-schemas webkitgtk ]; propagatedBuildInputs = with python2Packages; [ pygtk six ]; } diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 569a4593dfe..cc9bc38bc4d 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libsoup, webkit, gtk3, glib-networking +{ stdenv, fetchFromGitHub, pkgconfig, libsoup, webkitgtk, gtk3, glib-networking , gsettings-desktop-schemas, wrapGAppsHook }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; - buildInputs = [ gtk3 libsoup webkit glib-networking gsettings-desktop-schemas ]; + buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 9de7518677d..678f226816a 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, glib-networking, gtk2, libsoup, libX11, perl, - pkgconfig, webkit, gsettings-desktop-schemas }: + pkgconfig, webkitgtk, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "1.4.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings-desktop-schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkitgtk gsettings-desktop-schemas ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index bd3425e282a..e7aacb9de0f 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, makeWrapper, cmake, gtest , boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales -, webkit, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi +, webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi , libdbiDrivers, guile, perl, perlPackages }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales - webkit dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi + webkitgtk dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi libdbiDrivers guile perlWrapper perl ] ++ (with perlPackages; [ FinanceQuote DateManip ]); diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 9e9a10a011e..1a1ae3df942 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, -hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which, +hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, doxygen, boost, openscenegraph, gnome2, pangox_compat, xorg, git, bash, gtk2, makeWrapper }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchgit (import ./src-main.nix); buildInputs = [autoconf cmake automake libtool gfortran clang gnumake - hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which + hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkitgtk which lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison doxygen boost openscenegraph gnome2.gtkglext pangox_compat xorg.libXmu git gtk2 makeWrapper]; diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 0aa20f8b014..0dc9e8bd892 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2 -, libXt, libXtst, libXi, libGLU_combined, webkit, libsoup, xorg +, libXt, libXtst, libXi, libGLU_combined, webkitgtk, libsoup, xorg , pango, gdk_pixbuf, glib }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; nativeBuildInputs = [ unzip pkgconfig ]; - buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU_combined webkit libsoup ]; + buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU_combined webkitgtk libsoup ]; NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++ [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 252a87266e7..59eb707c8af 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -342,6 +342,7 @@ mapAliases ({ vimprobable2Wrapper = vimprobable2; # added 2015-01 virtviewer = virt-viewer; # added 2015-12-24 vorbisTools = vorbis-tools; # added 2016-01-26 + webkit = webkitgtk; # added 2019-03-05 weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06 weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 wineStaging = wine-staging; # added 2018-01-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b48d1b491d..ded711a54a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13022,8 +13022,6 @@ in wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; - webkit = webkitgtk; - wcslib = callPackage ../development/libraries/wcslib { }; webkitgtk = callPackage ../development/libraries/webkitgtk { @@ -19805,7 +19803,7 @@ in uwimap = callPackage ../tools/networking/uwimap { }; uzbl = callPackage ../applications/networking/browsers/uzbl { - webkit = webkitgtk24x-gtk2; + webkitgtk = webkitgtk24x-gtk2; }; utox = callPackage ../applications/networking/instant-messengers/utox { }; @@ -22999,7 +22997,7 @@ in }); vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 { - webkit = webkitgtk24x-gtk2; + webkitgtk = webkitgtk24x-gtk2; }; vimprobable2 = wrapFirefox vimprobable2-unwrapped { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 01cbc004b8f..17239c6d879 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -162,7 +162,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; utillinux = linux; utillinuxMinimal = linux; w3m = all; - webkit = linux; + webkitgtk = linux; wget = all; which = all; wicd = linux;