summary refs log tree commit diff
path: root/pkgs/data
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/data
parent21e3ff658ac2d7b7986169f31550aa5f65bb7635 (diff)
downloadnixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar
nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.gz
nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.bz2
nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.lz
nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.xz
nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.zst
nixpkgs-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/data')
-rw-r--r--pkgs/data/documentation/zeal/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index ccfb43b14d5..a6c77deb12e 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xlibs }:
+{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xorg }:
 
 stdenv.mkDerivation rec {
   version = "0.1.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    xlibs.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive
+    xorg.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive
   ];
 
   configurePhase = ''