MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #52772 from jtojnar/mesa-noglu-fix

Browse source 
mesa_noglu: fix build
This commit is contained in:
Jan Tojnar 2018-12-25 16:08:00 +01:00 committed by GitHub
commit d406ea6d8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/compilers/llvm/6/llvm.nix
View file

@ -13,7 +13,8 @@
, fetchpatch , fetchpatch
, debugVersion ? false , debugVersion ? false
, enableManpages ? false , enableManpages ? false
, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform ] # Mesa requires AMDGPU target
, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" ]
, enableSharedLibraries ? true , enableSharedLibraries ? true
}: }:

3
pkgs/development/compilers/llvm/7/llvm.nix
View file

@ -14,7 +14,8 @@
, debugVersion ? false , debugVersion ? false
, enableManpages ? false , enableManpages ? false
, enableSharedLibraries ? true , enableSharedLibraries ? true
, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform ] # Mesa requires AMDGPU target
, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" ]
, enablePFM ? !stdenv.isDarwin , enablePFM ? !stdenv.isDarwin
}: }:

4
pkgs/development/compilers/llvm/common.nix
View file

@ -2,7 +2,9 @@
rec { rec {
llvmBackend = platform: llvmBackend = platform:
if platform.parsed.cpu.family == "x86" then if builtins.typeOf platform == "string" then
platform
else if platform.parsed.cpu.family == "x86" then
"X86" "X86"
else if platform.parsed.cpu.name == "aarch64" then else if platform.parsed.cpu.name == "aarch64" then
"AArch64" "AArch64"