public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: transition from mesa_glu to libGLU

Browse Source
This commit is contained in:
Alexander V. Nikolaev
2018-02-24 14:59:47 +02:00
parent 8f2a22935c
commit 1bc1909e5b
42 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/glew/1.10.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi
{ stdenv, fetchurl, libGLU, x11, libXmu, libXi
, buildPlatform, hostPlatform
, AGL ? null
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ];
propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h
patchPhase = ''
sed -i 's|lib64|lib|' config/Makefile.linux

4
pkgs/development/libraries/glew/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi
{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
, buildPlatform, hostPlatform
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "out" "dev" "doc" ];
buildInputs = [ xlibsWrapper libXmu libXi ];
propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h
patchPhase = ''
sed -i 's|lib64|lib|' config/Makefile.linux