diff options
| -rw-r--r-- | pkgs/applications/graphics/fluxus/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/misc/rusty-psn/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/science/geometry/antiprism/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/science/biology/mirtk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/xonotic/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/graphics/nifskope/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 5 |
9 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index cb32981aef0fc..dfa518c5c5741 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -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 ]; diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/applications/misc/rusty-psn/default.nix index 058e4a9c028a9..d72905fe094f0 100644 --- a/pkgs/applications/misc/rusty-psn/default.nix +++ b/pkgs/applications/misc/rusty-psn/default.nix @@ -56,7 +56,6 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libxcb libGL - libGL.dev ]; buildNoDefaultFeatures = true; diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix index eca8b6f5f2b8f..9d4c6fc6a4091 100644 --- a/pkgs/applications/science/geometry/antiprism/default.nix +++ b/pkgs/applications/science/geometry/antiprism/default.nix @@ -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"; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index d92287feb1511..7f3079d5add5b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -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/" diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index ce02474eeb1e2..979f3589b3302 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { eigen fltk itk - libGLU.dev + libGLU python3 tbb vtk diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index cb5cc5220dfe8..acd9e6b2d1a91 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -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 ]; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 60eb1189391df..c3356cc254e41 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -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"; diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 90cf811e9130c..fdc05cbff04d8 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -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 = '' diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ddbf0b42fd61e..b12151969676f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -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; }; }; |