treewide: clean up uses of lib{GL,GLU,glut}.dev

These were now broken on Darwin; most of them were unnecessary,
but best practice for the remaining ones is to use `lib.getDev`.
This commit is contained in:
Emily 2024-06-22 08:34:20 +01:00
parent fbda1dbfd6
commit 8696744ce9
9 changed files with 16 additions and 16 deletions

View File

@ -33,17 +33,17 @@ stdenv.mkDerivation {
buildInputs = [
alsa-lib
fftw
libglut.dev
libglut
freetype
glew
libjack2
libjpeg.dev
libjpeg
liblo
libsndfile.dev
libtiff.dev
libsndfile
libtiff
ode
openal
openssl.dev
openssl
racket_7_9
];
nativeBuildInputs = [ scons ];

View File

@ -56,7 +56,6 @@ rustPlatform.buildRustPackage rec {
xorg.libXi
xorg.libxcb
libGL
libGL.dev
];
buildNoDefaultFeatures = true;

View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libX11 libGLU libGL.dev libglut.dev ];
buildInputs = [ libX11 libGLU libGL libglut ];
meta = with lib; {
homepage = "https://www.antiprism.com";

View File

@ -152,8 +152,8 @@ stdenv.mkDerivation (finalAttrs: ({
--replace "/System/Library/Frameworks/AGL.framework/" "${AGL}/Library/Frameworks/AGL.framework/"
'' else lib.optionalString libGLSupported ''
sed -i mkspecs/common/linux.conf \
-e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \
-e "/^QMAKE_LIBDIR_OPENGL/ s|$|${libGL.out}/lib|"
-e "/^QMAKE_INCDIR_OPENGL/ s|$|${lib.getDev libGL}/include|" \
-e "/^QMAKE_LIBDIR_OPENGL/ s|$|${lib.getLib libGL}/lib|"
'' + lib.optionalString (stdenv.hostPlatform.isx86_32 && stdenv.cc.isGNU) ''
sed -i mkspecs/common/gcc-base-unix.conf \
-e "/^QMAKE_LFLAGS_SHLIB/ s/-shared/-shared -static-libgcc/"

View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
eigen
fltk
itk
libGLU.dev
libGLU
python3
tbb
vtk

View File

@ -608,7 +608,7 @@ let
RCurl = [ pkgs.curl.dev ];
R2SWF = [ pkgs.pkg-config ];
rDEA = [ pkgs.glpk ];
rgl = with pkgs; [ libGLU libGLU.dev libGL xorg.libX11.dev freetype.dev libpng.dev ];
rgl = with pkgs; [ libGLU libGL xorg.libX11.dev freetype.dev libpng.dev ];
RGtk2 = [ pkgs.pkg-config ];
RProtoBuf = [ pkgs.pkg-config ];
Rpoppler = [ pkgs.pkg-config ];

View File

@ -66,8 +66,8 @@ let
nativeBuildInputs = [ unzip ];
buildInputs = [ libjpeg zlib libvorbis curl gmp ]
++ lib.optionals withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ]
++ lib.optionals withSDL [ SDL2.dev ];
++ lib.optionals withGLX [ libX11 libGLU libGL libXpm libXext libXxf86vm alsa-lib ]
++ lib.optionals withSDL [ SDL2 ];
sourceRoot = "Xonotic/source/darkplaces";

View File

@ -25,7 +25,7 @@ stdenv.mkDerivation {
})
] ++ (lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch);
buildInputs = [ qtbase qttools libGLU.dev ];
buildInputs = [ qtbase qttools libGLU ];
nativeBuildInputs = [ qmake wrapQtAppsHook ];
preConfigure = ''

View File

@ -20298,7 +20298,8 @@ with self; {
--replace 'WITH_PROJ => undef' 'WITH_PROJ => 0'
'';
nativeBuildInputs = with pkgs; [ autoPatchelfHook libGL.dev glibc.dev mesa_glu.dev ];
# FIXME: Why are these libraries in `nativeBuildInputs`?
nativeBuildInputs = with pkgs; [ autoPatchelfHook (lib.getDev libGL) (lib.getDev glibc) (lib.getDev mesa_glu) ];
buildInputs = [ DevelChecklib TestDeep TestException TestWarn ] ++
(with pkgs; [ gsl libglut xorg.libXmu xorg.libXi ]);
@ -20322,7 +20323,7 @@ with self; {
homepage = "https://pdl.perl.org";
license = with lib.licenses; [ artistic1 gpl1Plus ];
mainProgram = "pdl2";
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
};
};