about summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorAlexander V. Nikolaev <avn@avnik.info>2018-02-24 14:59:47 +0200
committerAlexander V. Nikolaev <avn@avnik.info>2018-02-24 17:05:43 +0200
commit1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (patch)
tree05a1695ab74385d7b4a7ccac1e4bd2fc601c1d15 /pkgs/development/tools
parent8f2a22935c31140891591ed3bb3e6baf230bc4f0 (diff)
downloadnixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.tar
nixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.tar.gz
nixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.tar.bz2
nixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.tar.lz
nixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.tar.xz
nixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.tar.zst
nixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.zip
treewide: transition from mesa_glu to libGLU
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/glslviewer/default.nix4
-rw-r--r--pkgs/development/tools/godot/default.nix4
-rw-r--r--pkgs/development/tools/unity3d/default.nix4
-rw-r--r--pkgs/development/tools/vogl/default.nix4
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix
index 86f78891b2fc..7a28f86562f6 100644
--- a/pkgs/development/tools/glslviewer/default.nix
+++ b/pkgs/development/tools/glslviewer/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage
 , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi
-, libX11, mesa_glu, Cocoa
+, libX11, libGLU, Cocoa
 }:
 
 stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    glfw mesa_glu glfw libXrandr libXdamage
+    glfw libGLU glfw libXrandr libXdamage
     libXext libXrender libXinerama libXcursor libXxf86vm
     libXi libX11
   ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 54e0c53d692c..1ea4d160b4cb 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor
 , libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib
-, libpulseaudio, mesa_glu, zlib }:
+, libpulseaudio, libGLU, zlib }:
 
 stdenv.mkDerivation rec {
   name    = "godot-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender
-    freetype openssl alsaLib libpulseaudio mesa_glu zlib
+    freetype openssl alsaLib libpulseaudio libGLU zlib
   ];
 
   patches = [ ./pkg_config_additions.patch ];
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index c7ba985d0f75..e507e3898c38 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt
-, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr, udev
+, gtk2, gdk_pixbuf, glib, libGLU, postgresql, nss, nspr, udev
 , alsaLib, GConf, cups, libcap, fontconfig, freetype, pango
 , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
 , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
@@ -9,7 +9,7 @@
 
 let
   libPath64 = lib.makeLibraryPath [
-    gcc.cc gtk2 gdk_pixbuf glib mesa_glu postgresql nss nspr
+    gcc.cc gtk2 gdk_pixbuf glib libGLU postgresql nss nspr
     alsaLib GConf cups libcap fontconfig freetype pango
     cairo dbus expat zlib libpng12 udev
     libX11 libXcursor libXdamage libXfixes libXrender libXi
diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix
index 9230d99efcc7..e87ba2b52c14 100644
--- a/pkgs/development/tools/vogl/default.nix
+++ b/pkgs/development/tools/vogl/default.nix
@@ -3,7 +3,7 @@
 , qtbase, qtx11extras
 , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
-, freeglut, mesa_glu
+, freeglut, libGLU
 , fetchpatch
 }:
 
@@ -33,7 +33,7 @@ mkDerivation rec {
     qtbase qtx11extras
     libdwarf libjpeg_turbo libunwind lzma tinyxml libX11
     SDL2 SDL2_gfx SDL2_image SDL2_ttf
-    freeglut mesa_glu
+    freeglut libGLU
   ];
 
   dontUseCmakeBuildDir = true;