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

mesa: reduce usage of the attribute and explain why

Browse Source
This commit is contained in:
Vladimír Čunát
2017-04-16 11:33:04 +02:00
parent d4d00f8c59
commit 2065eea424
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/godot/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, gcc, scons, pkgconfig, libX11, libXcursor
, libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib
, libpulseaudio, mesa, mesa_glu, zlib }:
, libpulseaudio, mesa_glu, zlib }:
stdenv.mkDerivation rec {
name = "godot-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gcc scons pkgconfig libX11 libXcursor libXinerama libXrandr libXrender
freetype openssl alsaLib libpulseaudio mesa mesa_glu zlib
freetype openssl alsaLib libpulseaudio mesa_glu zlib
];
patches = [ ./pkg_config_additions.patch ];

4
pkgs/development/tools/vogl/default.nix
View File

@@ -3,7 +3,7 @@
, makeQtWrapper, qtbase, qtx11extras
, libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
, SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
, freeglut, mesa, mesa_glu
, freeglut, mesa_glu
}:
stdenv.mkDerivation rec {
name = "vogl-${version}";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
qtbase qtx11extras
libdwarf libjpeg_turbo libunwind lzma tinyxml libX11
SDL2 SDL2_gfx SDL2_image SDL2_ttf
freeglut mesa mesa_glu
freeglut mesa_glu
];
enableParallelBuilding = true;