JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 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
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/x42-plugins/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig
, libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2
, mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
, mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec {
version = "20161230";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1yni9c17kl2pi9lqxip07b6g6lyfii1pch5czp183113gk54fwj5";
};
buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver];
buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat pkgconfig zita-convolver];
makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];

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;

6
pkgs/top-level/all-packages.nix
View File

@ -9077,10 +9077,12 @@ with pkgs;
in mo.drivers
);
# Please, avoid using this attribute. It was meant as transitional hack
# for packages that assume that libGLU and libGL live in the same prefix.
# Otherwise it's better to use mesa_glu or mesa_noglu, depending on whether
# you need libGLU or not (_glu propagates _noglu).
mesa = mesaDarwinOr (buildEnv {
name = "mesa-${mesa_noglu.version}";
# FIXME: this causes mesa to have a runtime dependency on
# mesa_noglu.dev.
paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu mesa_glu.dev ];
meta = {
platforms = lib.platforms.unix;