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/misc/emulators | |
| parent | 803e87aa1e5bd071713276fd13e55854f7e5e385 (diff) | |
| download | nixlib-6bf1421f13d667c2997b67728cf777c6a70716a5.tar nixlib-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.gz nixlib-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.bz2 nixlib-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.lz nixlib-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.xz nixlib-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.zst nixlib-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/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/caprice32/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix index 5928d53d5422..c0c3b40f6b65 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/misc/emulators/caprice32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, pkgconfig, SDL, freetype, zlib, mesa }: +{ stdenv, fetchFromGitHub, libpng, pkgconfig, SDL, freetype, zlib }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 9af5c889c42f..b1a0ba5809f9 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.libGL.osmesa pkgs.libdrm ] + ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa_noglu.osmesa pkgs.libdrm ] ++ (with pkgs.xorg; [ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext ]))); |