openshadinglanguage: move override to package.nix (#495553)

2026-03-01 17:58:05 +00:00
parent bc2794b307 291f0fddfa
commit 0b2e2c1364
2 changed files with 2 additions and 9 deletions
@@ -1,14 +1,12 @@
 {
  bison,
  boost,
-  clang,
  cmake,
  fetchFromGitHub,
  flex,
  lib,
-  libclang,
  libxml2,
-  llvm,
+  llvmPackages_19,
  openexr,
  openimageio,
  partio,
@@ -22,6 +20,7 @@

 let
  boost_static = boost.override { enableStatic = true; };
+  inherit (llvmPackages_19) clang libclang llvm;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "openshadinglanguage";
@@ -3160,12 +3160,6 @@ with pkgs;

  update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { };

-  openshadinglanguage = callPackage ../by-name/op/openshadinglanguage/package.nix {
-    libclang = llvmPackages_19.libclang;
-    clang = clang_19;
-    llvm = llvm_19;
-  };
-
  opentelemetry-collector = opentelemetry-collector-releases.otelcol;
  opentelemetry-collector-builder = callPackage ../tools/misc/opentelemetry-collector/builder.nix { };
  opentelemetry-collector-contrib = opentelemetry-collector-releases.otelcol-contrib;