diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:26:18 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:54:34 +0200 |
commit | 88c9f8b574ead01e32c5ee5228679723343cd52c (patch) | |
tree | 92196d2055a7842ae40c022581220bace87ab9e1 /pkgs/desktops/gnome-2 | |
parent | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (diff) | |
download | nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.gz nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.bz2 nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.lz nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.xz nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.zst nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.zip |
xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc. - Avoided renaming local (and different) xlibs binding in gcc*. - Fixed cases where both xorg and xlibs were used. Hopefully everything still works as before.
Diffstat (limited to 'pkgs/desktops/gnome-2')
-rw-r--r-- | pkgs/desktops/gnome-2/platform/gtkglext/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/platform/libgnomeui/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index b278dadfe24c..ff50bcd5e5cd 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xlibs }: +{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xorg }: stdenv.mkDerivation rec { name = "gtkglext-1.2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n"; }; - buildInputs = with xlibs; + buildInputs = with xorg; [ pkgconfig glib gtk mesa pango pangox_compat libX11 libXmu ]; # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 1bf2635b9878..961fb1c0a199 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango +{ stdenv, fetchurl, pkgconfig, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome_keyring, libglade }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = - [ xlibs.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; + [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } |