movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-19 16:09:19 +03:00
Code Activity

Merge #33590: mesa: make it find drirc

Browse source
This commit is contained in:
Vladimír Čunát 2018-01-21 09:29:37 +01:00
commit a0f8e3a30c
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/mesa/default.nix
View file

@ -98,7 +98,7 @@ stdenv.mkDerivation {
# TODO: Figure out how to enable opencl without having a runtime dependency on clang # TODO: Figure out how to enable opencl without having a runtime dependency on clang
configureFlags = [ configureFlags = [
"--sysconfdir=/etc" "--sysconfdir=${driverLink}/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--with-dri-driverdir=$(drivers)/lib/dri" "--with-dri-driverdir=$(drivers)/lib/dri"
"--with-dri-searchpath=${driverLink}/lib/dri" "--with-dri-searchpath=${driverLink}/lib/dri"
@ -197,7 +197,6 @@ stdenv.mkDerivation {
''; '';
# TODO: # TODO:
# @vcunat isn't sure if drirc will be found when in $out/etc/;
# check $out doesn't depend on llvm: builder failures are ignored # check $out doesn't depend on llvm: builder failures are ignored
# for some reason grep -qv '${llvmPackages.llvm}' -R "$out"; # for some reason grep -qv '${llvmPackages.llvm}' -R "$out";
postFixup = '' postFixup = ''