diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 15:12:44 +0200 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:06:49 +0200 |
| commit | 0acec7e984ff38b7a296a459ba4b539a3b719c1b (patch) | |
| tree | 1d60ce67493ab87f80acb127f4e26a11a0324c28 /pkgs/misc/screensavers | |
| parent | 1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (diff) | |
| download | nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.gz nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.bz2 nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.lz nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.xz nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.zst nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.zip | |
treewide: transition mesa to libGLU_combined
Diffstat (limited to 'pkgs/misc/screensavers')
| -rw-r--r-- | pkgs/misc/screensavers/electricsheep/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/screensavers/rss-glx/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/screensavers/xscreensaver/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 4a51facb4aa4..17cf99d8b00c 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl -, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, mesa +, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU_combined , glee }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 libav lua5_1 curl libpng xorg.libXrender - flam3 libgtop boost tinyxml freeglut mesa glee + flam3 libgtop boost tinyxml freeglut libGLU_combined glee ]; preAutoreconf = '' diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 7b280d770b38..e8b9346a8727 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, mesa, imagemagick, libtiff, bzip2}: +{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU_combined, imagemagick, libtiff, bzip2}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mesa xlibsWrapper imagemagick libtiff bzip2 ]; + buildInputs = [ libGLU_combined xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index b07c11a23dd3..b337b6cb0e90 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 -, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk2 +, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU_combined, gtk2 , libxml2, libglade, intltool, xorg, makeWrapper, gle , forceInstallAllHacks ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bc perl libjpeg mesa gtk2 libxml2 libglade pam + [ pkgconfig bc perl libjpeg libGLU_combined gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXxf86misc intltool xorg.appres makeWrapper gle ]; |