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

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/graphics/fluxus/default.nix
View File

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

1
pkgs/applications/misc/rusty-psn/default.nix
View File

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

2
pkgs/applications/science/geometry/antiprism/default.nix
View File

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

4
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

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

2
pkgs/development/libraries/science/biology/mirtk/default.nix
View File

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

2
pkgs/development/r-modules/default.nix
View File

@ -608,7 +608,7 @@ let
RCurl = [ pkgs.curl.dev ]; RCurl = [ pkgs.curl.dev ];
R2SWF = [ pkgs.pkg-config ]; R2SWF = [ pkgs.pkg-config ];
rDEA = [ pkgs.glpk ]; 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 ]; RGtk2 = [ pkgs.pkg-config ];
RProtoBuf = [ pkgs.pkg-config ]; RProtoBuf = [ pkgs.pkg-config ];
Rpoppler = [ pkgs.pkg-config ]; Rpoppler = [ pkgs.pkg-config ];

4
pkgs/games/xonotic/default.nix
View File

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

2
pkgs/tools/graphics/nifskope/default.nix
View File

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

5
pkgs/top-level/perl-packages.nix
View File

@ -20298,7 +20298,8 @@ with self; {
--replace 'WITH_PROJ => undef' 'WITH_PROJ => 0' --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 ] ++ buildInputs = [ DevelChecklib TestDeep TestException TestWarn ] ++
(with pkgs; [ gsl libglut xorg.libXmu xorg.libXi ]); (with pkgs; [ gsl libglut xorg.libXmu xorg.libXi ]);
@ -20322,7 +20323,7 @@ with self; {
homepage = "https://pdl.perl.org"; homepage = "https://pdl.perl.org";
license = with lib.licenses; [ artistic1 gpl1Plus ]; license = with lib.licenses; [ artistic1 gpl1Plus ];
mainProgram = "pdl2"; mainProgram = "pdl2";
platforms = lib.platforms.linux; platforms = lib.platforms.unix;
}; };
}; };