diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 14:06:44 +0200 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:03:46 +0200 |
| commit | 8f2a22935c31140891591ed3bb3e6baf230bc4f0 (patch) | |
| tree | 30cd829c96a4abaffff99dcc027eba0e2e064ef1 /pkgs/tools | |
| parent | 8da9b485ec008c9c7c4adcfa604a289b3050c2c6 (diff) | |
| download | nixpkgs-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar nixpkgs-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.gz nixpkgs-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.bz2 nixpkgs-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.lz nixpkgs-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.xz nixpkgs-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.zst nixpkgs-8f2a22935c31140891591ed3bb3e6baf230bc4f0.zip | |
treewide: transition from mesa_noglu to libGL
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/asymptote/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/graphics/glxinfo/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 6c6a93dc73a..40f4dc89366 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl , freeglut, ghostscriptX, imagemagick, fftw - , boehmgc, mesa_glu, mesa_noglu, ncurses, readline, gsl, libsigsegv + , boehmgc, mesa_glu, libGL, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz , darwin }: @@ -20,7 +20,7 @@ let boehmgc ncurses readline gsl libsigsegv python zlib perl texLive texinfo xz ] ++ stdenv.lib.optionals stdenv.isLinux - [ freeglut mesa_glu mesa_noglu mesa_noglu.osmesa ] + [ freeglut mesa_glu libGL mesa_noglu.osmesa ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) ; diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 03be1e90930..5960b8b6f04 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, mesa_noglu }: +{ stdenv, fetchurl, xlibsWrapper, libGL }: let version = "8.3.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; }; - buildInputs = [ xlibsWrapper mesa_noglu ]; + buildInputs = [ xlibsWrapper libGL ]; configurePhase = "true"; |