From 04c31a5de10a64c52440846f47b22a8e7312081c Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 5 Mar 2018 14:53:38 +0100
Subject: libGL rename: fallout after a week on master

and a few nitpicks.
---
 pkgs/tools/X11/primus/lib.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix
index 6aaaf83d975..d9bebf6055f 100644
--- a/pkgs/tools/X11/primus/lib.nix
+++ b/pkgs/tools/X11/primus/lib.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, fetchpatch
-, libX11, mesa_noglu
+, libX11, libGL
 , nvidia_x11 ? null
 , libglvnd
 }:
 
 let
   aPackage =
-    if nvidia_x11 == null then mesa_noglu
+    if nvidia_x11 == null then libGL
     else if nvidia_x11.useGLVND then libglvnd
     else nvidia_x11;
 
@@ -28,12 +28,12 @@ in stdenv.mkDerivation {
     })
   ];
 
-  buildInputs = [ libX11 mesa_noglu ];
+  buildInputs = [ libX11 libGL ];
 
   makeFlags = [ "LIBDIR=$(out)/lib"
                 "PRIMUS_libGLa=${aPackage}/lib/libGL.so"
-                "PRIMUS_libGLd=${mesa_noglu}/lib/libGL.so"
-                "PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so"
+                "PRIMUS_libGLd=${libGL}/lib/libGL.so"
+                "PRIMUS_LOAD_GLOBAL=${libGL}/lib/libglapi.so"
               ];
 
   installPhase = ''
-- 
cgit 1.4.1