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

gnome2: remove aliases

Browse Source
This commit is contained in:
Jan Tojnar
2019-03-05 15:37:45 +01:00
parent bbe29c055d
commit 57c745f530
22 changed files with 72 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
+2 -2
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
inherit (python2.pkgs) python pygtk;
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk librsvg libwnck libgtop python ];
buildInputs = [ gtk2 librsvg libwnck libgtop python ];
propagatedBuildInputs = [ gnome_python pygtk ];
# gnome-python-desktop expects that .pth file is already installed by PyGTK
pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
+2 -2
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;
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ python glib gtk GConf libgnome gnome_vfs ];
buildInputs = [ python glib gtk2 GConf libgnome gnome_vfs ];
propagatedBuildInputs = [ pygobject2 pygtk dbus-python ];
# gnome-python expects that .pth file is already installed by PyGTK in the
pkgs/desktops/gnome-2/bindings/libglademm/default.nix
+4 -4
View File
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtkmm, libglade }:
{ stdenv, fetchurl, pkgconfig, intltool, gtkmm2, libglade }:
stdenv.mkDerivation rec {
name = "libglademm-2.6.7";
src = fetchurl {
url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2";
sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q";
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool ];
propagatedBuildInputs = [ gtkmm libglade ];
propagatedBuildInputs = [ gtkmm2 libglade ];
}
pkgs/desktops/gnome-2/default.nix
+12 -17
View File
@@ -1,14 +1,6 @@
{ stdenv, pkgs, lib }:
{ config, stdenv, pkgs, lib }:
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
@@ -22,9 +14,7 @@ lib.makeScope pkgs.newScope (self: with self; {
libglade = callPackage ./platform/libglade { };
libgnomeprint = callPackage ./platform/libgnomeprint {
bison = pkgs.bison2;
};
libgnomeprint = callPackage ./platform/libgnomeprint { };
libgnomeprintui = callPackage ./platform/libgnomeprintui { };
@@ -46,7 +36,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome_python = callPackage ./bindings/gnome-python { };
gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { };
python_rsvg = self.gnome_python_desktop;
gnome_vfs = callPackage ./platform/gnome-vfs { };
@@ -62,9 +51,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { };
# Required for nautilus
inherit (pkgs) libunique;
gtkglext = callPackage ./platform/gtkglext { };
#### DESKTOP
@@ -84,13 +70,22 @@ lib.makeScope pkgs.newScope (self: with self; {
libglademm = callPackage ./bindings/libglademm { };
} // lib.optionalAttrs (config.allowAliases or true) {
inherit (pkgs)
# GTK Libs
glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
# Included for backwards compatibility
libsoup libwnck gtk-doc gnome-doc-utils;
libsoup libwnck gtk-doc gnome-doc-utils rarian;
gtk = pkgs.gtk2;
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;
})
pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }:
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
stdenv.mkDerivation rec {
name = "gnome-icon-theme-2.91.93";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6";
};
nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk2 ];
# remove a tree of dirs with no files within
postInstall = '' rm -r "$out/share/locale" '';
pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib
, gnome-common, gtk, pango
, gnome-common, gtk2, pango
, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }:
with stdenv.lib;
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
atk cairo glib gtk
atk cairo glib gtk2
pango libxml2Python perl intltool
gettext
] ++ optionals stdenv.isDarwin [
pkgs/desktops/gnome-2/desktop/vte/default.nix
+2 -2
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}:
let
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib gtk ncurses ] ++
buildInputs = [ intltool glib gtk2 ncurses ] ++
stdenv.lib.optionals pythonSupport [python pygtk];
configureFlags = [
pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+2 -2
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 {
name = "gtkglext-1.2.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with xorg;
[ pkgconfig glib gtk libGLU_combined pango libX11 libXmu ];
[ pkgconfig glib gtk2 libGLU_combined pango libX11 libXmu ];
propagatedBuildInputs = [ pangox_compat ];
patches = [
pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, intltool,
{ stdenv, fetchurl, pkgconfig, gtk2, intltool,
GConf, enchant, isocodes, gnome_icon_theme }:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = [ ./01_remove-disable-deprecated.patch ];
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" ];
}
pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
+2 -2
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 }:
stdenv.mkDerivation rec {
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ];
buildInputs = [ bison popt gtk2 libxml2 GConf libglade libtool ];
propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
}
pkgs/desktops/gnome-2/platform/libglade/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gtk, libxml2, python, gettext}:
{stdenv, fetchurl, pkgconfig, gtk2, libxml2, python, gettext}:
stdenv.mkDerivation {
name = "libglade-2.6.4";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk python gettext ];
buildInputs = [ gtk2 python gettext ];
NIX_LDFLAGS = "-lgmodule-2.0";
pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+2 -2
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 {
name = "libgnomecanvas-${minVer}.3";
@@ -13,5 +13,5 @@ stdenv.mkDerivation rec {
buildInputs = [ libglade ];
nativeBuildInputs = [ pkgconfig intltool ];
propagatedBuildInputs = [ libart_lgpl gtk ];
propagatedBuildInputs = [ libart_lgpl gtk2 ];
}
pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libgnomecanvas, gtkmm }:
{ stdenv, fetchurl, pkgconfig, libgnomecanvas, gtkmm2 }:
stdenv.mkDerivation {
name = "libgnomecanvasmm-2.26.0";
@@ -9,5 +9,5 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libgnomecanvas gtkmm ];
buildInputs = [ libgnomecanvas gtkmm2 ];
}
pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
+2 -2
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 {
name = "libgnomecups-0.2.3";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patches = [ ./glib.patch ./cups_1.6.patch ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk gettext intltool libart_lgpl ];
buildInputs = [ gtk2 gettext intltool libart_lgpl ];
propagatedBuildInputs = [ libxml2 ];
}
pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl
, libgnomecups, bison, flex }:
{ stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl
, libgnomecups, bison2, flex }:
stdenv.mkDerivation rec {
name = "libgnomeprint-2.18.8";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./bug653388.patch ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk gettext intltool libart_lgpl libgnomecups bison flex ];
buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison2 flex ];
propagatedBuildInputs = [ libxml2 ];
pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
+2 -2
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 {
name = "libgnomeprintui-2.18.6";
@@ -9,5 +9,5 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme];
buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome_icon_theme];
}
pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2 }:
{stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2 }:
stdenv.mkDerivation {
name = "libgtkhtml-2.11.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk gettext ];
buildInputs = [ gtk2 gettext ];
propagatedBuildInputs = [ libxml2 ];
hardeningDisable = [ "format" ];