mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-25 23:36:16 +02:00
Move clang dev deps to the nix devshell override
This commit is contained in:
parent
8d39c0c196
commit
66d37b7338
2 changed files with 4 additions and 5 deletions
|
@ -395,7 +395,7 @@
|
||||||
stdenvs)));
|
stdenvs)));
|
||||||
|
|
||||||
devShells = let
|
devShells = let
|
||||||
makeShell = pkgs: stdenv: (pkgs.nix.override { inherit stdenv; }).overrideAttrs (_: {
|
makeShell = pkgs: stdenv: (pkgs.nix.override { inherit stdenv; }).overrideAttrs (attrs: {
|
||||||
installFlags = "sysconfdir=$(out)/etc";
|
installFlags = "sysconfdir=$(out)/etc";
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
PATH=$prefix/bin:$PATH
|
PATH=$prefix/bin:$PATH
|
||||||
|
@ -405,6 +405,9 @@
|
||||||
# Make bash completion work.
|
# Make bash completion work.
|
||||||
XDG_DATA_DIRS+=:$out/share
|
XDG_DATA_DIRS+=:$out/share
|
||||||
'';
|
'';
|
||||||
|
nativeBuildInputs = attrs.nativeBuildInputs or []
|
||||||
|
++ lib.optional stdenv.cc.isClang pkgs.buildPackages.bear
|
||||||
|
++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) pkgs.buildPackages.clang-tools;
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
forAllSystems (system:
|
forAllSystems (system:
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
, aws-sdk-cpp
|
, aws-sdk-cpp
|
||||||
, boehmgc
|
, boehmgc
|
||||||
, buildPackages
|
|
||||||
, nlohmann_json
|
, nlohmann_json
|
||||||
, bison
|
, bison
|
||||||
, boost
|
, boost
|
||||||
|
@ -208,9 +207,6 @@ in {
|
||||||
# changelog
|
# changelog
|
||||||
++ lib.optional (!officialRelease && buildUnreleasedNotes) changelog-d
|
++ lib.optional (!officialRelease && buildUnreleasedNotes) changelog-d
|
||||||
++ lib.optional enableInternalAPIDocs doxygen
|
++ lib.optional enableInternalAPIDocs doxygen
|
||||||
|
|
||||||
++ lib.optional stdenv.cc.isClang buildPackages.bear
|
|
||||||
++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) buildPackages.clang-tools
|
|
||||||
;
|
;
|
||||||
|
|
||||||
buildInputs = lib.optionals doBuild [
|
buildInputs = lib.optionals doBuild [
|
||||||
|
|
Loading…
Reference in a new issue