public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

webkit: move to aliases

Browse Source
This commit is contained in:
Jan Tojnar 2019-03-05 17:40:00 +01:00
parent 78b94d335d
commit d3ff902e94
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
9 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/uzbl/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, python3, makeWrapper { 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, # This package needs python3 during buildtime,
# but Python 2 + packages during runtime. # but Python 2 + packages during runtime.
@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig python3 makeWrapper ]; nativeBuildInputs = [ pkgconfig python3 makeWrapper ];
buildInputs = [ gsettings-desktop-schemas webkit ]; buildInputs = [ gsettings-desktop-schemas webkitgtk ];
propagatedBuildInputs = with python2Packages; [ pygtk six ]; propagatedBuildInputs = with python2Packages; [ pygtk six ];
} }

4
pkgs/applications/networking/browsers/vimb/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, libsoup, webkit, gtk3, glib-networking { stdenv, fetchFromGitHub, pkgconfig, libsoup, webkitgtk, gtk3, glib-networking
, gsettings-desktop-schemas, wrapGAppsHook , gsettings-desktop-schemas, wrapGAppsHook
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; 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"}" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];

4
pkgs/applications/networking/browsers/vimprobable2/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, glib-networking, gtk2, libsoup, libX11, perl, { stdenv, fetchurl, makeWrapper, glib-networking, gtk2, libsoup, libX11, perl,
pkgconfig, webkit, gsettings-desktop-schemas }: pkgconfig, webkitgtk, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.4.2"; version = "1.4.2";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings-desktop-schemas ]; buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkitgtk gsettings-desktop-schemas ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

4
pkgs/applications/office/gnucash/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, makeWrapper, cmake, gtest { fetchurl, stdenv, pkgconfig, makeWrapper, cmake, gtest
, boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales , 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 , libdbiDrivers, guile, perl, perlPackages
}: }:
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales 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 libdbiDrivers guile
perlWrapper perl perlWrapper perl
] ++ (with perlPackages; [ FinanceQuote DateManip ]); ] ++ (with perlPackages; [ FinanceQuote DateManip ]);

4
pkgs/applications/science/misc/openmodelica/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, {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, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,
doxygen, boost, openscenegraph, gnome2, pangox_compat, xorg, git, bash, gtk2, makeWrapper }: doxygen, boost, openscenegraph, gnome2, pangox_compat, xorg, git, bash, gtk2, makeWrapper }:
@ -15,7 +15,7 @@ stdenv.mkDerivation {
src = fetchgit (import ./src-main.nix); src = fetchgit (import ./src-main.nix);
buildInputs = [autoconf cmake automake libtool gfortran clang gnumake 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 lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison
doxygen boost openscenegraph gnome2.gtkglext pangox_compat xorg.libXmu doxygen boost openscenegraph gnome2.gtkglext pangox_compat xorg.libXmu
git gtk2 makeWrapper]; git gtk2 makeWrapper];

4
pkgs/development/libraries/java/swt/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2 { 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 , pango, gdk_pixbuf, glib
}: }:
@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
sourceRoot = "."; sourceRoot = ".";
nativeBuildInputs = [ unzip pkgconfig ]; 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 ]) ++ 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" ]; [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ];

1
pkgs/top-level/aliases.nix
View File

@ -342,6 +342,7 @@ mapAliases ({
vimprobable2Wrapper = vimprobable2; # added 2015-01 vimprobable2Wrapper = vimprobable2; # added 2015-01
virtviewer = virt-viewer; # added 2015-12-24 virtviewer = virt-viewer; # added 2015-12-24
vorbisTools = vorbis-tools; # added 2016-01-26 vorbisTools = vorbis-tools; # added 2016-01-26
webkit = webkitgtk; # added 2019-03-05
weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06 weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06
weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
wineStaging = wine-staging; # added 2018-01-08 wineStaging = wine-staging; # added 2018-01-08

6
pkgs/top-level/all-packages.nix
View File

@ -13022,8 +13022,6 @@ in
wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { };
webkit = webkitgtk;
wcslib = callPackage ../development/libraries/wcslib { }; wcslib = callPackage ../development/libraries/wcslib { };
webkitgtk = callPackage ../development/libraries/webkitgtk { webkitgtk = callPackage ../development/libraries/webkitgtk {
@ -19805,7 +19803,7 @@ in
uwimap = callPackage ../tools/networking/uwimap { }; uwimap = callPackage ../tools/networking/uwimap { };
uzbl = callPackage ../applications/networking/browsers/uzbl { uzbl = callPackage ../applications/networking/browsers/uzbl {
webkit = webkitgtk24x-gtk2; webkitgtk = webkitgtk24x-gtk2;
}; };
utox = callPackage ../applications/networking/instant-messengers/utox { }; utox = callPackage ../applications/networking/instant-messengers/utox { };
@ -22999,7 +22997,7 @@ in
}); });
vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 { vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 {
webkit = webkitgtk24x-gtk2; webkitgtk = webkitgtk24x-gtk2;
}; };
vimprobable2 = wrapFirefox vimprobable2-unwrapped { }; vimprobable2 = wrapFirefox vimprobable2-unwrapped { };

2
pkgs/top-level/release-small.nix
View File

@ -162,7 +162,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
utillinux = linux; utillinux = linux;
utillinuxMinimal = linux; utillinuxMinimal = linux;
w3m = all; w3m = all;
webkit = linux; webkitgtk = linux;
wget = all; wget = all;
which = all; which = all;
wicd = linux; wicd = linux;