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/mygui/default.nix
+4 -6
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid,
boost, pkgconfig, withOgre ? false, ogre ? null, libGL, libGLU ? null } :
boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } :
let
renderSystem = if withOgre then "3" else "4";
@@ -14,11 +14,9 @@ in stdenv.mkDerivation rec {
sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w";
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 unzip cmake ois freetype libuuid boost ]
++ (if withOgre then [ ogre ] else [libGL libGLU]);
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libX11 unzip ois freetype libuuid boost ]
++ (if withOgre then [ ogre ] else [ libGL libGLU ]);
# Tools are disabled due to compilation failures.
cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ];