castxml: remove inherit (.*)
reference on all-packages.nix
According to the issue linked at the end, filling arguments for `callPackage` in all-packages.nix breaks splicing and makes the expressions incompatible with cross-compilation. This issue is more pronounced in the many `inherit (darwin)` calls. However, it is present in similar contexts too. The idea here is not the smartest: it just hides those inheritances from `all-packages.nix` and sends them to the `default.nix` expressions. Issue: https://github.com/NixOS/nixpkgs/issues/204303
This commit is contained in:
parent
726088a964
commit
dae55bc2bd
|
@ -1,17 +1,20 @@
|
||||||
{ lib
|
{ lib,
|
||||||
, stdenv
|
stdenv,
|
||||||
, fetchFromGitHub
|
fetchFromGitHub,
|
||||||
, cmake
|
cmake,
|
||||||
, libclang
|
libffi,
|
||||||
, libffi
|
libxml2,
|
||||||
, libxml2
|
zlib,
|
||||||
, llvm
|
withManual ? true,
|
||||||
, sphinx
|
withHTML ? true,
|
||||||
, zlib
|
llvmPackages,
|
||||||
, withManual ? true
|
python3,
|
||||||
, withHTML ? true
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (llvmPackages) libclang llvm;
|
||||||
|
inherit (python3.pkgs) sphinx;
|
||||||
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "castxml";
|
pname = "castxml";
|
||||||
version = "0.5.1";
|
version = "0.5.1";
|
||||||
|
|
|
@ -357,10 +357,7 @@ with pkgs;
|
||||||
|
|
||||||
castget = callPackage ../applications/networking/feedreaders/castget { };
|
castget = callPackage ../applications/networking/feedreaders/castget { };
|
||||||
|
|
||||||
castxml = callPackage ../development/tools/castxml {
|
castxml = callPackage ../development/tools/castxml { };
|
||||||
inherit (llvmPackages) libclang llvm;
|
|
||||||
inherit (python3.pkgs) sphinx;
|
|
||||||
};
|
|
||||||
|
|
||||||
catatonit = callPackage ../applications/virtualization/catatonit { };
|
catatonit = callPackage ../applications/virtualization/catatonit { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue