diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
| commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
| tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/libraries/ogre | |
| parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
| parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
| download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip | |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ogre')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix | 15 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix | 14 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/ogre/default.nix | 14 |
3 files changed, 20 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix b/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix index fe23181cfc67..849db216b921 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix @@ -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; @@ -35,8 +34,8 @@ stdenv.mkDerivation { meta = { description = "A 3D engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix b/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix index 29c83a2962ee..30d1dd185547 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix @@ -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; @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "A 3D engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/libraries/ogre/default.nix b/nixpkgs/pkgs/development/libraries/ogre/default.nix index 491ff4edddc6..ae65da3f418b 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -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,24 +23,22 @@ 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/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; } |