diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-21 09:29:37 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-21 09:29:37 +0100 |
| commit | a0f8e3a30c971d6bec2eb68f1e3afe4284d8445c (patch) | |
| tree | f013f83683d4f0e5428a09860dbe18d09bdf86e5 /pkgs/development/libraries | |
| parent | 75d8096108aa10ad61faa94e8492396ed3bad6f1 (diff) | |
| parent | af32623d043a635fba54dafa67349ec1796d23b3 (diff) | |
| download | nixpkgs-a0f8e3a30c971d6bec2eb68f1e3afe4284d8445c.tar nixpkgs-a0f8e3a30c971d6bec2eb68f1e3afe4284d8445c.tar.gz nixpkgs-a0f8e3a30c971d6bec2eb68f1e3afe4284d8445c.tar.bz2 nixpkgs-a0f8e3a30c971d6bec2eb68f1e3afe4284d8445c.tar.lz nixpkgs-a0f8e3a30c971d6bec2eb68f1e3afe4284d8445c.tar.xz nixpkgs-a0f8e3a30c971d6bec2eb68f1e3afe4284d8445c.tar.zst nixpkgs-a0f8e3a30c971d6bec2eb68f1e3afe4284d8445c.zip | |
Merge #33590: mesa: make it find drirc
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index e1fe061a965..d343bd1112d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation { # TODO: Figure out how to enable opencl without having a runtime dependency on clang configureFlags = [ - "--sysconfdir=/etc" + "--sysconfdir=${driverLink}/etc" "--localstatedir=/var" "--with-dri-driverdir=$(drivers)/lib/dri" "--with-dri-searchpath=${driverLink}/lib/dri" @@ -197,7 +197,6 @@ stdenv.mkDerivation { ''; # 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 # for some reason grep -qv '${llvmPackages.llvm}' -R "$out"; postFixup = '' |