Merge pull request #208311 from atorres1985-contrib/castxml

castxml: remove `inherit (.*)` reference on all-packages.nix
2022-12-30 09:20:52 -03:00
parent e6c26349fe dae55bc2bd
commit bde23bbdff
2 changed files with 16 additions and 16 deletions
@@ -1,17 +1,20 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, libclang
-, libffi
-, libxml2
-, llvm
-, sphinx
-, zlib
-, withManual ? true
-, withHTML ? true
+{ lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  libffi,
+  libxml2,
+  zlib,
+  withManual ? true,
+  withHTML ? true,
+  llvmPackages,
+  python3,
 }:

+let
+  inherit (llvmPackages) libclang llvm;
+  inherit (python3.pkgs) sphinx;
+in
 stdenv.mkDerivation (finalAttrs: {
  pname = "castxml";
  version = "0.5.1";
@@ -357,10 +357,7 @@ with pkgs;

  castget = callPackage ../applications/networking/feedreaders/castget { };

-  castxml = callPackage ../development/tools/castxml {
-    inherit (llvmPackages) libclang llvm;
-    inherit (python3.pkgs) sphinx;
-  };
+  castxml = callPackage ../development/tools/castxml { };

  catatonit = callPackage ../applications/virtualization/catatonit { };