diff options
author | Nikolay Amiantov <ab@fmap.me> | 2018-03-17 18:47:55 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-26 14:01:49 +0300 |
commit | 6bf1421f13d667c2997b67728cf777c6a70716a5 (patch) | |
tree | a8ad2d39efc437215fe958df70326ae263f98798 /pkgs/development/libraries/ocl-icd | |
parent | 803e87aa1e5bd071713276fd13e55854f7e5e385 (diff) | |
download | nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.tar nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.gz nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.bz2 nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.lz nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.xz nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.zst nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.zip |
treewide: refactor to use libglvnd
* Implement libGL as a symlink package which uses libraries from libglvnd and headers from Mesa (since ones from libglvnd are outdated). * Use libGL_driver.driverLink treewide; add FHS paths where possible.
Diffstat (limited to 'pkgs/development/libraries/ocl-icd')
-rw-r--r-- | pkgs/development/libraries/ocl-icd/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index afd2a7b12df..ec6dc5f9052 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ruby, opencl-headers, libGL }: +{stdenv, fetchurl, ruby, opencl-headers, libGL_driver }: stdenv.mkDerivation rec { name = "ocl-icd-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ opencl-headers ]; postPatch = '' - sed -i 's,"/etc/OpenCL/vendors","${libGL.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c + sed -i 's,"/etc/OpenCL/vendors","${libGL_driver.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; meta = with stdenv.lib; { |