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/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" ];