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

treewide: cmake buildInputs to nativeBuildInputs, minor cleanups

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-01 11:52:33 +07:00
parent 54ab07c1fe
commit b04fc593e7
212 changed files with 611 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/ogre/1.10.x.nix
+4 -5
View File
@@ -2,7 +2,7 @@
, cmake, libGLU, libGL
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkgconfig
, libX11, libXmu, libSM, pkg-config
, libXxf86vm, libICE
, libXrender
, withNvidiaCg ? false, nvidia_cg_toolkit
@@ -21,13 +21,12 @@ stdenv.mkDerivation {
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkg-config ];
buildInputs =
[ cmake libGLU libGL
[ libGLU libGL
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM pkgconfig
libX11 libXmu libSM
libXxf86vm libICE
libXrender
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
pkgs/development/libraries/ogre/1.9.x.nix
+4 -4
View File
@@ -2,7 +2,7 @@
, cmake, libGLU, libGL
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkgconfig
, libX11, libXmu, libSM, pkg-config
, libXxf86vm, libICE
, libXrender
, withNvidiaCg ? false, nvidia_cg_toolkit
@@ -24,13 +24,13 @@ stdenv.mkDerivation rec {
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkg-config ];
buildInputs =
[ cmake libGLU libGL
[ libGLU libGL
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM pkgconfig
libX11 libXmu libSM
libXxf86vm libICE
libXrender
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
pkgs/development/libraries/ogre/default.nix
+3 -5
View File
@@ -2,7 +2,7 @@
, cmake, libGLU, libGL
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkgconfig
, libX11, libXmu, libSM, pkg-config
, libXxf86vm, libICE
, unzip
, libXrender
@@ -23,19 +23,17 @@ stdenv.mkDerivation rec {
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
enableParallelBuilding = true;
nativeBuildInputs = [ cmake unzip pkg-config ];
buildInputs =
[ cmake libGLU libGL
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM pkgconfig
libX11 libXmu libSM
libXxf86vm libICE
libXrender
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
nativeBuildInputs = [ unzip ];
meta = {
description = "A 3D engine";
homepage = "https://www.ogre3d.org/";