dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

gnome2: remove aliases

Browse Source
This commit is contained in:
Jan Tojnar 2019-03-03 22:30:31 +01:00
parent bbe29c055d
commit 57c745f530
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
22 changed files with 72 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/gtk2fontsel/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gtk }: {stdenv, fetchurl, pkgconfig, gtk2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.1"; version = "0.1";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ stdenv gtk ]; buildInputs = [ stdenv gtk2 ];
preferLocalBuild = true; preferLocalBuild = true;

4
pkgs/applications/networking/instant-messengers/ekiga/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool { stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
, perlPackages, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook , perlPackages, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
, libsigcxx, gtk, dbus-glib, libnotify, libXext, xorgproto, gnome3, boost, libsecret , libsigcxx, gtk2, dbus-glib, libnotify, libXext, xorgproto, gnome3, boost, libsecret
, pkgconfig, libxml2, unixODBC, db, nspr, nss, zlib , pkgconfig, libxml2, unixODBC, db, nspr, nss, zlib
, libXrandr, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: , libXrandr, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
evolution-data-server gnome-doc-utils avahi evolution-data-server gnome-doc-utils avahi
libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite libsigcxx gtk2 dbus-glib libnotify libXext xorgproto sqlite
gnome3.libsoup glib gnome3.adwaita-icon-theme boost gnome3.libsoup glib gnome3.adwaita-icon-theme boost
autoreconfHook pkgconfig libxml2 unixODBC db nspr autoreconfHook pkgconfig libxml2 unixODBC db nspr
nss zlib libsecret libXrandr which libxslt libtasn1 nss zlib libsecret libXrandr which libxslt libtasn1

4
pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk }: { stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk2 }:
let let
inherit (python2.pkgs) python pygtk; inherit (python2.pkgs) python pygtk;
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk librsvg libwnck libgtop python ]; buildInputs = [ gtk2 librsvg libwnck libgtop python ];
propagatedBuildInputs = [ gnome_python pygtk ]; propagatedBuildInputs = [ gnome_python pygtk ];
# gnome-python-desktop expects that .pth file is already installed by PyGTK # gnome-python-desktop expects that .pth file is already installed by PyGTK

4
pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk, gnome_vfs }: { stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk2, gnome_vfs }:
with stdenv.lib; with stdenv.lib;
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ python glib gtk GConf libgnome gnome_vfs ]; buildInputs = [ python glib gtk2 GConf libgnome gnome_vfs ];
propagatedBuildInputs = [ pygobject2 pygtk dbus-python ]; propagatedBuildInputs = [ pygobject2 pygtk dbus-python ];
# gnome-python expects that .pth file is already installed by PyGTK in the # gnome-python expects that .pth file is already installed by PyGTK in the

4
pkgs/desktops/gnome-2/bindings/libglademm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtkmm, libglade }: { stdenv, fetchurl, pkgconfig, intltool, gtkmm2, libglade }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libglademm-2.6.7"; name = "libglademm-2.6.7";
@ -13,5 +13,5 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool ]; buildInputs = [ intltool ];
propagatedBuildInputs = [ gtkmm libglade ]; propagatedBuildInputs = [ gtkmm2 libglade ];
} }

29
pkgs/desktops/gnome-2/default.nix
View File

@ -1,14 +1,6 @@
{ stdenv, pkgs, lib }: { config, stdenv, pkgs, lib }:
lib.makeScope pkgs.newScope (self: with self; { lib.makeScope pkgs.newScope (self: with self; {
# Backward compatibility.
gtkdoc = self.gtk-doc;
startup_notification = pkgs.libstartup_notification;
startupnotification = pkgs.libstartup_notification;
gnomedocutils = self.gnome-doc-utils;
gnomeicontheme = self.gnome_icon_theme;
gnome_common = gnome-common;
inherit (pkgs) rarian;
#### PLATFORM #### PLATFORM
@ -22,9 +14,7 @@ lib.makeScope pkgs.newScope (self: with self; {
libglade = callPackage ./platform/libglade { }; libglade = callPackage ./platform/libglade { };
libgnomeprint = callPackage ./platform/libgnomeprint { libgnomeprint = callPackage ./platform/libgnomeprint { };
bison = pkgs.bison2;
};
libgnomeprintui = callPackage ./platform/libgnomeprintui { }; libgnomeprintui = callPackage ./platform/libgnomeprintui { };
@ -46,7 +36,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome_python = callPackage ./bindings/gnome-python { }; gnome_python = callPackage ./bindings/gnome-python { };
gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { };
python_rsvg = self.gnome_python_desktop;
gnome_vfs = callPackage ./platform/gnome-vfs { }; gnome_vfs = callPackage ./platform/gnome-vfs { };
@ -62,9 +51,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { }; gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { };
# Required for nautilus
inherit (pkgs) libunique;
gtkglext = callPackage ./platform/gtkglext { }; gtkglext = callPackage ./platform/gtkglext { };
#### DESKTOP #### DESKTOP
@ -84,13 +70,22 @@ lib.makeScope pkgs.newScope (self: with self; {
libglademm = callPackage ./bindings/libglademm { }; libglademm = callPackage ./bindings/libglademm { };
} // lib.optionalAttrs (config.allowAliases or true) {
inherit (pkgs) inherit (pkgs)
# GTK Libs # GTK Libs
glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2 glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
# Included for backwards compatibility # Included for backwards compatibility
libsoup libwnck gtk-doc gnome-doc-utils; libsoup libwnck gtk-doc gnome-doc-utils rarian;
gtk = pkgs.gtk2; gtk = pkgs.gtk2;
gtkmm = pkgs.gtkmm2; gtkmm = pkgs.gtkmm2;
python_rsvg = self.gnome_python_desktop;
gtkdoc = pkgs.gtk-doc;
startup_notification = pkgs.libstartup_notification;
startupnotification = pkgs.libstartup_notification;
gnomedocutils = pkgs.gnome-doc-utils;
gnomeicontheme = self.gnome_icon_theme;
gnome_common = gnome-common;
}) })

4
pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }: { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-icon-theme-2.91.93"; name = "gnome-icon-theme-2.91.93";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6"; sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6";
}; };
nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk2 ];
# remove a tree of dirs with no files within # remove a tree of dirs with no files within
postInstall = '' rm -r "$out/share/locale" ''; postInstall = '' rm -r "$out/share/locale" '';

4
pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib {stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib
, gnome-common, gtk, pango , gnome-common, gtk2, pango
, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }: , libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }:
with stdenv.lib; with stdenv.lib;
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
atk cairo glib gtk atk cairo glib gtk2
pango libxml2Python perl intltool pango libxml2Python perl intltool
gettext gettext
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [

4
pkgs/desktops/gnome-2/desktop/vte/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk, ncurses { stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk2, ncurses
, pythonSupport ? false, python27Packages}: , pythonSupport ? false, python27Packages}:
let let
@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib gtk ncurses ] ++ buildInputs = [ intltool glib gtk2 ncurses ] ++
stdenv.lib.optionals pythonSupport [python pygtk]; stdenv.lib.optionals pythonSupport [python pygtk];
configureFlags = [ configureFlags = [

4
pkgs/desktops/gnome-2/platform/gtkglext/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }: { stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk2, libGLU_combined, pango, pangox_compat, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkglext-1.2.0"; name = "gtkglext-1.2.0";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = with xorg; buildInputs = with xorg;
[ pkgconfig glib gtk libGLU_combined pango libX11 libXmu ]; [ pkgconfig glib gtk2 libGLU_combined pango libX11 libXmu ];
propagatedBuildInputs = [ pangox_compat ]; propagatedBuildInputs = [ pangox_compat ];
patches = [ patches = [

4
pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, intltool, { stdenv, fetchurl, pkgconfig, gtk2, intltool,
GConf, enchant, isocodes, gnome_icon_theme }: GConf, enchant, isocodes, gnome_icon_theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = [ ./01_remove-disable-deprecated.patch ]; patches = [ ./01_remove-disable-deprecated.patch ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk intltool GConf enchant isocodes gnome_icon_theme ]; buildInputs = [ gtk2 intltool GConf enchant isocodes gnome_icon_theme ];
NIX_LDFLAGS = [ "-lgthread-2.0" ]; NIX_LDFLAGS = [ "-lgthread-2.0" ];
} }

4
pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk, libtool { stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk2, libtool
, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }: , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ]; buildInputs = [ bison popt gtk2 libxml2 GConf libglade libtool ];
propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ]; propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
} }

4
pkgs/desktops/gnome-2/platform/libglade/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gtk, libxml2, python, gettext}: {stdenv, fetchurl, pkgconfig, gtk2, libxml2, python, gettext}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libglade-2.6.4"; name = "libglade-2.6.4";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk python gettext ]; buildInputs = [ gtk2 python gettext ];
NIX_LDFLAGS = "-lgmodule-2.0"; NIX_LDFLAGS = "-lgmodule-2.0";

4
pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }: { stdenv, fetchurl, pkgconfig, gtk2, intltool, libart_lgpl, libglade }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgnomecanvas-${minVer}.3"; name = "libgnomecanvas-${minVer}.3";
@ -13,5 +13,5 @@ stdenv.mkDerivation rec {
buildInputs = [ libglade ]; buildInputs = [ libglade ];
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
propagatedBuildInputs = [ libart_lgpl gtk ]; propagatedBuildInputs = [ libart_lgpl gtk2 ];
} }

4
pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libgnomecanvas, gtkmm }: { stdenv, fetchurl, pkgconfig, libgnomecanvas, gtkmm2 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libgnomecanvasmm-2.26.0"; name = "libgnomecanvasmm-2.26.0";
@ -9,5 +9,5 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libgnomecanvas gtkmm ]; buildInputs = [ libgnomecanvas gtkmm2 ];
} }

4
pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }: { stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgnomecups-0.2.3"; name = "libgnomecups-0.2.3";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patches = [ ./glib.patch ./cups_1.6.patch ]; patches = [ ./glib.patch ./cups_1.6.patch ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk gettext intltool libart_lgpl ]; buildInputs = [ gtk2 gettext intltool libart_lgpl ];
propagatedBuildInputs = [ libxml2 ]; propagatedBuildInputs = [ libxml2 ];
} }

6
pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl { stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl
, libgnomecups, bison, flex }: , libgnomecups, bison2, flex }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgnomeprint-2.18.8"; name = "libgnomeprint-2.18.8";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./bug653388.patch ]; patches = [ ./bug653388.patch ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk gettext intltool libart_lgpl libgnomecups bison flex ]; buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison2 flex ];
propagatedBuildInputs = [ libxml2 ]; propagatedBuildInputs = [ libxml2 ];

4
pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}: {stdenv, fetchurl, pkgconfig, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome_icon_theme}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libgnomeprintui-2.18.6"; name = "libgnomeprintui-2.18.6";
@ -9,5 +9,5 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme]; buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome_icon_theme];
} }

4
pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2 }: {stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libgtkhtml-2.11.1"; name = "libgtkhtml-2.11.1";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk gettext ]; buildInputs = [ gtk2 gettext ];
propagatedBuildInputs = [ libxml2 ]; propagatedBuildInputs = [ libxml2 ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

2
pkgs/desktops/xfce/default.nix
View File

@ -3,7 +3,7 @@
lib.makeScope pkgs.newScope (self: with self; { lib.makeScope pkgs.newScope (self: with self; {
#### NixOS support #### NixOS support
inherit (pkgs.gnome2) libglade libwnck vte gtksourceview; inherit (pkgs.gnome2) libglade vte gtksourceview;
inherit (pkgs.gnome3) dconf; inherit (pkgs.gnome3) dconf;
inherit (pkgs.perlPackages) URI; inherit (pkgs.perlPackages) URI;

30
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -37818,7 +37818,7 @@ self: {
description = "Proof-of-concept tool for writing using binary choices"; description = "Proof-of-concept tool for writing using binary choices";
license = "GPL"; license = "GPL";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) pango;}; }) {inherit (pkgs) gtk2; inherit (pkgs) pango;};
"bitstream" = callPackage "bitstream" = callPackage
({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck
@ -49324,7 +49324,7 @@ self: {
description = "Bindings to the Clutter animation library"; description = "Bindings to the Clutter animation library";
license = "LGPL"; license = "LGPL";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) clutter; inherit (pkgs.gnome2) pango;}; }) {inherit (pkgs) clutter; inherit (pkgs) pango;};
"cmaes" = callPackage "cmaes" = callPackage
({ mkDerivation, base, doctest, doctest-prop, mtl, process, random ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random
@ -86876,7 +86876,7 @@ self: {
doHaddock = false; doHaddock = false;
description = "GIRepository (gobject-introspection) bindings"; description = "GIRepository (gobject-introspection) bindings";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs.gnome3) gobject-introspection;}; }) {inherit (pkgs) gobject-introspection;};
"gi-glib" = callPackage "gi-glib" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, glib ({ mkDerivation, base, bytestring, Cabal, containers, glib
@ -87179,7 +87179,7 @@ self: {
description = "JavaScriptCore bindings"; description = "JavaScriptCore bindings";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.gnome3) webkitgtk;}; }) {inherit (pkgs) webkitgtk;};
"gi-notify" = callPackage "gi-notify" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
@ -87244,7 +87244,7 @@ self: {
''; '';
description = "Pango bindings"; description = "Pango bindings";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
"gi-pangocairo" = callPackage "gi-pangocairo" = callPackage
({ mkDerivation, base, bytestring, Cabal, cairo, containers ({ mkDerivation, base, bytestring, Cabal, cairo, containers
@ -87269,7 +87269,7 @@ self: {
''; '';
description = "PangoCairo bindings"; description = "PangoCairo bindings";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
"gi-poppler" = callPackage "gi-poppler" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@ -87330,7 +87330,7 @@ self: {
doHaddock = false; doHaddock = false;
description = "Libsoup bindings"; description = "Libsoup bindings";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs.gnome2) libsoup;}; }) {inherit (pkgs) libsoup;};
"gi-vte" = callPackage "gi-vte" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@ -87397,7 +87397,7 @@ self: {
description = "WebKit2 bindings"; description = "WebKit2 bindings";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.gnome3) webkitgtk;}; }) {inherit (pkgs) webkitgtk;};
"gi-webkit2webextension" = callPackage "gi-webkit2webextension" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gio ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@ -87443,7 +87443,7 @@ self: {
description = "Wnck bindings"; description = "Wnck bindings";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.gnome2) libwnck;}; }) {inherit (pkgs) libwnck;};
"gi-xlib" = callPackage "gi-xlib" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
@ -100853,7 +100853,7 @@ self: {
description = "Generate Haskell bindings for GObject Introspection capable libraries"; description = "Generate Haskell bindings for GObject Introspection capable libraries";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib; }) {inherit (pkgs) glib;
inherit (pkgs.gnome3) gobject-introspection;}; inherit (pkgs) gobject-introspection;};
"haskell-gi-base" = callPackage "haskell-gi-base" = callPackage
({ mkDerivation, base, bytestring, containers, glib, text }: ({ mkDerivation, base, bytestring, containers, glib, text }:
@ -162583,7 +162583,7 @@ self: {
description = "Binding to the Pango text rendering engine"; description = "Binding to the Pango text rendering engine";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.gnome2) pango;}; }) {inherit (pkgs) pango;};
"pangraph" = callPackage "pangraph" = callPackage
({ mkDerivation, algebraic-graphs, attoparsec, base, bytestring ({ mkDerivation, algebraic-graphs, attoparsec, base, bytestring
@ -170484,7 +170484,7 @@ self: {
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2; }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2;
inherit (pkgs.gnome2) pango; inherit (pkgs) poppler;}; inherit (pkgs) pango; inherit (pkgs) poppler;};
"populate-setup-exe-cache" = callPackage "populate-setup-exe-cache" = callPackage
({ mkDerivation, base }: ({ mkDerivation, base }:
@ -202162,7 +202162,7 @@ self: {
description = "Experimental web browser"; description = "Experimental web browser";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.gnome2) libsoup;}; }) {inherit (pkgs) libsoup;};
"spine" = callPackage "spine" = callPackage
({ mkDerivation, base }: ({ mkDerivation, base }:
@ -216310,7 +216310,7 @@ self: {
description = "A desktop bar based on WebKit"; description = "A desktop bar based on WebKit";
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) gtk3; inherit (pkgs.gnome3) webkitgtk;}; }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;};
"tibetan-utils" = callPackage "tibetan-utils" = callPackage
({ mkDerivation, base, composition-prelude, either, hspec ({ mkDerivation, base, composition-prelude, either, hspec
@ -231877,7 +231877,7 @@ self: {
description = "JavaScriptCore FFI from webkitgtk"; description = "JavaScriptCore FFI from webkitgtk";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.gnome3) webkitgtk;}; }) {inherit (pkgs) webkitgtk;};
"webkitgtk3" = callPackage "webkitgtk3" = callPackage
({ mkDerivation, base, bytestring, Cabal, cairo, glib ({ mkDerivation, base, bytestring, Cabal, cairo, glib

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

@ -3175,9 +3175,7 @@ in
gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
gssdp = callPackage ../development/libraries/gssdp { gssdp = callPackage ../development/libraries/gssdp { };
inherit (gnome2) libsoup;
};
gt5 = callPackage ../tools/system/gt5 { }; gt5 = callPackage ../tools/system/gt5 { };
@ -3204,9 +3202,7 @@ in
gup = callPackage ../development/tools/build-managers/gup {}; gup = callPackage ../development/tools/build-managers/gup {};
gupnp = callPackage ../development/libraries/gupnp { gupnp = callPackage ../development/libraries/gupnp { };
inherit (gnome2) libsoup;
};
gupnp-av = callPackage ../development/libraries/gupnp-av {}; gupnp-av = callPackage ../development/libraries/gupnp-av {};
@ -17585,9 +17581,7 @@ in
gspell = callPackage ../development/libraries/gspell { }; gspell = callPackage ../development/libraries/gspell { };
gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { };
inherit (gnome2) gtk;
};
guake = callPackage ../applications/misc/guake { }; guake = callPackage ../applications/misc/guake { };
@ -22348,7 +22342,7 @@ in
dpkg = callPackage ../tools/package-management/dpkg { }; dpkg = callPackage ../tools/package-management/dpkg { };
ekiga = newScope pkgs.gnome2 ../applications/networking/instant-messengers/ekiga { }; ekiga = callPackage ../applications/networking/instant-messengers/ekiga { };
emulationstation = callPackage ../misc/emulators/emulationstation { emulationstation = callPackage ../misc/emulators/emulationstation {
stdenv = overrideCC stdenv gcc5; stdenv = overrideCC stdenv gcc5;