From 88c9f8b574ead01e32c5ee5228679723343cd52c Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 15 Sep 2015 11:26:18 +0200 Subject: 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. --- pkgs/os-specific/linux/opengl/xorg-sys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/opengl/xorg-sys/default.nix') diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index 2cebb8d9dcc26..5bb757a73a06e 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -6,11 +6,11 @@ # Of course, use of the driver in /usr/lib is highly impure. But it # might actually work ;-) -{stdenv, xlibs, expat, libdrm}: +{stdenv, xorg, expat, libdrm}: stdenv.mkDerivation { name = "xorg-sys-opengl-3"; builder = ./builder.sh; - neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm stdenv.cc.cc]; + neededLibs = [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; } -- cgit 1.4.1