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

treewide/xorg: replace *proto with xorgproto

Browse Source
This commit is contained in:
Lengyel Balazs
2019-01-04 14:38:57 +01:00
committed by Robin Gloster
parent 51d6b1bdec
commit f4a53ff3bc
133 changed files with 348 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/ogre/1.9.x.nix
+8 -8
View File
@@ -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 = {
pkgs/development/libraries/ogre/default.nix
+8 -8
View File
@@ -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 = {