treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{ stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }:
|
||||
|
||||
let
|
||||
let
|
||||
sourceInfo = rec {
|
||||
version="1.1.0";
|
||||
name="liquidfun-${version}";
|
||||
@@ -16,7 +16,8 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
inherit (sourceInfo) name version;
|
||||
buildInputs = [ cmake libGLU libGL libX11 libXi ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libGLU libGL libX11 libXi ];
|
||||
|
||||
sourceRoot = "liquidfun/Box2D/";
|
||||
|
||||
@@ -26,10 +27,10 @@ stdenv.mkDerivation {
|
||||
sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@'
|
||||
substituteInPlace Box2D/CMakeLists.txt --replace "Common/b2GrowableStack.h" "Common/b2GrowableStack.h Common/b2GrowableBuffer.h"
|
||||
'';
|
||||
|
||||
|
||||
configurePhase = ''
|
||||
mkdir Build
|
||||
cd Build;
|
||||
cd Build;
|
||||
cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out ..
|
||||
'';
|
||||
|
||||
@@ -45,4 +46,3 @@ stdenv.mkDerivation {
|
||||
homepage = "https://google.github.io/liquidfun/";
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user