swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

make mesa inputs more specific

Browse source
This commit is contained in:
Jude Taylor 2015-10-28 10:55:38 -07:00
parent 31fa564076
commit 1786f6bd4d
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/mesa-darwin/default.nix
View file

@ -2,7 +2,7 @@
, python, libxml2Python, file, expat, makedepend, xorg, llvm, libffi, libvdpau , python, libxml2Python, file, expat, makedepend, xorg, llvm, libffi, libvdpau
, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
, enableExtraFeatures ? false # not maintained , enableExtraFeatures ? false # not maintained
, darwin , OpenGL, apple_sdk, Xplugin
}: }:
let let
@ -23,11 +23,7 @@ let
presentproto presentproto
libX11 libXext libxcb libXt libxshmfence libX11 libXext libxcb libXt libxshmfence
libffi libvdpau libffi libvdpau
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL apple_sdk.sdk Xplugin ];
darwin.apple_sdk.frameworks.OpenGL
darwin.apple_sdk.sdk
darwin.apple_sdk.libs.Xplugin
];
postUnpack = '' postUnpack = ''
ln -s darwin $sourceRoot/configs/current ln -s darwin $sourceRoot/configs/current

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

@ -7623,7 +7623,11 @@ let
mesaSupported = lib.elem system lib.platforms.mesaPlatforms; mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
mesaDarwinOr = alternative: if stdenv.isDarwin mesaDarwinOr = alternative: if stdenv.isDarwin
then callPackage ../development/libraries/mesa-darwin { } then callPackage ../development/libraries/mesa-darwin {
inherit (darwin.apple_sdk.frameworks) OpenGL;
inherit (darwin.apple_sdk.libs) Xplugin;
inherit (darwin) apple_sdk;
}
else alternative; else alternative;
mesa_noglu = mesaDarwinOr (callPackage ../development/libraries/mesa { mesa_noglu = mesaDarwinOr (callPackage ../development/libraries/mesa {
# makes it slower, but during runtime we link against just mesa_drivers # makes it slower, but during runtime we link against just mesa_drivers