diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-04-14 21:02:27 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-04-14 21:38:23 +0200 |
| commit | 8340454544b5f6502056d9ddbf919a6395164033 (patch) | |
| tree | 66daa2d41d078296ff100287cff14b65f2868f63 | |
| parent | 557dff54aacdfd34f6f39d5e1d6c7354dba390f4 (diff) | |
| download | nixlib-8340454544b5f6502056d9ddbf919a6395164033.tar nixlib-8340454544b5f6502056d9ddbf919a6395164033.tar.gz nixlib-8340454544b5f6502056d9ddbf919a6395164033.tar.bz2 nixlib-8340454544b5f6502056d9ddbf919a6395164033.tar.lz nixlib-8340454544b5f6502056d9ddbf919a6395164033.tar.xz nixlib-8340454544b5f6502056d9ddbf919a6395164033.tar.zst nixlib-8340454544b5f6502056d9ddbf919a6395164033.zip | |
mesa: have all output on /run/opengl-driver{,-32}
Fixes #2242 in a different way (cleaner, I hope).
| -rw-r--r-- | nixos/modules/hardware/opengl.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 06ecddab2362..485ac008dd8a 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -93,6 +93,7 @@ in { name = "mesa-drivers+txc-${p.mesa_drivers.version}"; paths = [ p.mesa_drivers + p.mesa_noglu # mainly for libGL (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc) ]; }; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index b7de29109dcb..9452ae0a7c21 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -151,11 +151,6 @@ stdenv.mkDerivation { substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" '' + /* move vdpau drivers to $drivers/lib, so they are found */ '' mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau - '' + /* add libGL* links from /run/opengl-driver */ '' - ( - cd "$drivers/lib" - cp -s "$out"/lib/*.so . - ) ''; #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM |