Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vtk_9: propagate libX11 and libGL on Linux #206935

Merged
merged 1 commit into from
Dec 20, 2022
+4 −6
Merged

vtk_9: propagate libX11 and libGL on Linux #206935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pkgs/applications/graphics/f3d/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/libraries/vtk/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [
Expand All @@ -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;

Expand Down