about summary refs log tree commit diff
path: root/pkgs/development/libraries/geis
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-09-15 11:26:18 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-09-15 12:54:34 +0200
commit88c9f8b574ead01e32c5ee5228679723343cd52c (patch)
tree92196d2055a7842ae40c022581220bace87ab9e1 /pkgs/development/libraries/geis
parent21e3ff658ac2d7b7986169f31550aa5f65bb7635 (diff)
downloadnixlib-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/development/libraries/geis')
-rw-r--r--pkgs/development/libraries/geis/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 24c24fe5f123..5ef53ec79391 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -1,5 +1,5 @@
 { enableX11 ? true
-, stdenv, fetchurl, pkgconfig, xlibs, xorgserver, python3, dbus_libs, frame, grail }:
+, stdenv, fetchurl, pkgconfig, xorg, xorgserver, python3, dbus_libs, frame, grail }:
 
 stdenv.mkDerivation rec {
   name = "geis-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig python3 dbus_libs frame grail ]
-  ++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.xorgserver];
+  ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.xorgserver];
 
   configureFlags = stdenv.lib.optional enableX11"--enable-x11";