From 78f5700a554abe89fee5760911ee199c31fdf19d Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 23 Jul 2026 19:30:38 +0200 Subject: [PATCH] openctm: remove the gtk2 viewer on linux ref. #410814 That viewer was not available on macos and this package and meshcat are fine there without it anyways --- pkgs/by-name/op/openctm/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openctm/package.nix b/pkgs/by-name/op/openctm/package.nix index 1e76f30df494..b53e23ef1c53 100644 --- a/pkgs/by-name/op/openctm/package.nix +++ b/pkgs/by-name/op/openctm/package.nix @@ -4,8 +4,8 @@ fetchurl, pkg-config, libglut, - gtk2, libGLU, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -30,14 +30,18 @@ stdenv.mkDerivation (finalAttrs: { libglut libGLU ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 ]; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace "tools/tinyxml/Makefile.linux" \ --replace-warn "-Wno-format" "-Wno-format -Wno-format-security" substituteInPlace "tools/Makefile.linux" \ - --replace-warn "-lglut" "-lglut -lGL -lGLU" + --replace-warn "-lglut" "-lglut -lGL -lGLU" \ + --replace-fail "all: ctmconv ctmviewer ctmbench" "all: ctmconv ctmbench" + substituteInPlace "Makefile.linux" \ + --replace-fail "$""(CP) tools/ctmviewer $""(BINDIR)" "" \ + --replace-fail "$""(CP) doc/ctmviewer.1 $""(MAN1DIR)" "" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace "lib/Makefile.macosx" \