public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Get rid of libGLU_combined

Browse Source
This commit is contained in:
adisbladis
2019-11-18 20:10:43 +00:00
parent e6963bc983
commit c9d8624ccd
241 changed files with 518 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/screensavers/electricsheep/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl
, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU_combined
, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL
, glee }:
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [
wxGTK30 libav lua5_1 curl libpng xorg.libXrender
flam3 libgtop boost tinyxml freeglut libGLU_combined glee
flam3 libgtop boost tinyxml freeglut libGLU libGL glee
];
preAutoreconf = ''
pkgs/misc/screensavers/rss-glx/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU_combined, imagemagick, libtiff, bzip2}:
{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}:
stdenv.mkDerivation rec {
version = "0.9.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libGLU_combined xlibsWrapper imagemagick libtiff bzip2 ];
buildInputs = [ libGLU libGL xlibsWrapper imagemagick libtiff bzip2 ];
NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick";
NIX_LDFLAGS= "-rpath ${libXext}/lib";
pkgs/misc/screensavers/xscreensaver/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11
, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU_combined, gtk2
, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2
, libxml2, libglade, intltool, xorg, makeWrapper, gle
, forceInstallAllHacks ? false
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig bc perl libjpeg libGLU_combined gtk2 libxml2 libglade pam
[ pkgconfig bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam
libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
libXxf86misc intltool xorg.appres makeWrapper gle
];