diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-07 15:19:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-07 23:35:47 +0000 |
| commit | e5013c05a2f845255debf94318ab38ecef1c186b (patch) | |
| tree | bec11a0bd31d3432a16899e5539f1098f1c168a4 /nixpkgs/pkgs/development/libraries/ogre | |
| parent | 4fc07c92ec07cafcf6d56143ea7334693143ef88 (diff) | |
| parent | 2d2f10475138b7206572dc3ec288184df2be022e (diff) | |
| download | nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.gz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.bz2 nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.lz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.xz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.zst nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.zip | |
Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ogre')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix | 16 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/ogre/default.nix | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix b/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix index 0f6495f0c9c1..42babc32ecdb 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix @@ -1,10 +1,10 @@ { fetchFromGitHub, stdenv, lib , cmake, libGLU_combined -, freetype, freeimage, zziplib, randrproto, libXrandr +, freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois -, xproto, libX11, libXmu, libSM, pkgconfig -, libXxf86vm, xf86vidmodeproto, libICE -, renderproto, libXrender +, libX11, libXmu, libSM, pkgconfig +, libXxf86vm, libICE +, libXrender , withNvidiaCg ? false, nvidia_cg_toolkit , withSamples ? false }: @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libGLU_combined - freetype freeimage zziplib randrproto libXrandr + freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois - xproto libX11 libXmu libSM pkgconfig - libXxf86vm xf86vidmodeproto libICE - renderproto libXrender + libX11 libXmu libSM pkgconfig + libXxf86vm libICE + libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; meta = { diff --git a/nixpkgs/pkgs/development/libraries/ogre/default.nix b/nixpkgs/pkgs/development/libraries/ogre/default.nix index 0b7202459f9e..d847f447048d 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, lib , cmake, libGLU_combined -, freetype, freeimage, zziplib, randrproto, libXrandr +, freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois -, xproto, libX11, libXmu, libSM, pkgconfig -, libXxf86vm, xf86vidmodeproto, libICE -, renderproto, libXrender +, libX11, libXmu, libSM, pkgconfig +, libXxf86vm, libICE +, libXrender , withNvidiaCg ? false, nvidia_cg_toolkit , withSamples ? false }: @@ -25,11 +25,11 @@ stdenv.mkDerivation { buildInputs = [ cmake libGLU_combined - freetype freeimage zziplib randrproto libXrandr + freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois - xproto libX11 libXmu libSM pkgconfig - libXxf86vm xf86vidmodeproto libICE - renderproto libXrender + libX11 libXmu libSM pkgconfig + libXxf86vm libICE + libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; meta = { |