diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 42671599a643..d32662937aff 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -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 diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 555e7d0a45de..1994e4ace114 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -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;