pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11
|
||||
{lib, stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11
|
||||
, qmake, GLUT, fixDarwinDylibNames }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
buildInputs = [ glew ]
|
||||
++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin GLUT;
|
||||
++ lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ]
|
||||
++ lib.optional stdenv.isDarwin GLUT;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -27,13 +27,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = ''
|
||||
install -D license.txt "$out/share/doc/opencsg/license.txt"
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv $out/bin/*.app $out/Applications
|
||||
rmdir $out/bin || true
|
||||
'';
|
||||
|
||||
postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
postFixup = lib.optionalString stdenv.isDarwin ''
|
||||
app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample
|
||||
install_name_tool -change \
|
||||
$(otool -L $app | awk '/opencsg.+dylib/ { print $1 }') \
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
$app
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Constructive Solid Geometry library";
|
||||
homepage = "http://www.opencsg.org/";
|
||||
platforms = platforms.unix;
|
||||
|
||||
Reference in New Issue
Block a user