Merge pull request #206935 from bcdarwin/vtk_9-propagate-libs
vtk_9: propagate libX11 and libGL on Linux
This commit is contained in:
commit
6919026471
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue