b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #206935 from bcdarwin/vtk_9-propagate-libs

Browse source 
vtk_9: propagate libX11 and libGL on Linux
This commit is contained in:
Linus Heckemann 2022-12-20 19:15:59 +01:00 committed by GitHub
parent 27dd8e291d cf339f3d14
commit 6919026471
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/graphics/f3d/default.nix
View file

@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ vtk_9 ]
++ lib.optionals stdenv.isLinux [ libGL libX11 ]
++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
buildInputs = [ vtk_9 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
# conflict between VTK and Nixpkgs;
# see https://github.com/NixOS/nixpkgs/issues/89167

6
pkgs/development/libraries/vtk/generic.nix
View file

@ -30,8 +30,6 @@ in stdenv.mkDerivation rec {
else [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ])
++ optionals stdenv.isLinux [
libGLU
libGL
libX11
xorgproto
libXt
] ++ optionals stdenv.isDarwin [
@ -51,7 +49,9 @@ in stdenv.mkDerivation rec {
] ++ optionals enablePython [
pythonInterpreter
];
propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ];
propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ]
++ optionals stdenv.isLinux [ libX11 libGL ];
# see https://github.com/NixOS/nixpkgs/pull/178367#issuecomment-1238827254
patches = map fetchpatch patchesToFetch;