summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Ballou <kballou@devnulllabs.io>2020-01-24 11:15:29 -0700
committerKenny Ballou <kballou@devnulllabs.io>2020-01-24 11:15:29 -0700
commita218e45b728ba5ebbaf328700c9b49171fa7b2c2 (patch)
treedd786396a573a75efe1c4ea4471e76c32571c363
parent6bf046bcac80b68cc7f821eb52987c8700a6854a (diff)
downloadcfg.nix-a218e45b728ba5ebbaf328700c9b49171fa7b2c2.tar.gz
cfg.nix-a218e45b728ba5ebbaf328700c9b49171fa7b2c2.tar.xz
overlays: c++/clang: move clang packages add gcc
Replace the clang tools in the cppOverlay and create a new overlay for clang tooling. Signed-off-by: Kenny Ballou <kballou@devnulllabs.io>
-rw-r--r--overlays/20-clang.nix10
-rw-r--r--overlays/20-cpp.nix3
-rw-r--r--system/packages.nix1
3 files changed, 12 insertions, 2 deletions
diff --git a/overlays/20-clang.nix b/overlays/20-clang.nix
new file mode 100644
index 0000000..824cdfb
--- /dev/null
+++ b/overlays/20-clang.nix
@@ -0,0 +1,10 @@
+self: super:
+{
+ clang-overlay = super.buildEnv {
+ name = "clang-overlang";
+ paths = [
+ self.clang
+ self.clang-tools
+ ];
+ };
+}
diff --git a/overlays/20-cpp.nix b/overlays/20-cpp.nix
index 75e0804..d755401 100644
--- a/overlays/20-cpp.nix
+++ b/overlays/20-cpp.nix
@@ -4,11 +4,10 @@ self: super:
name = "cppOverlay";
paths = [
self.boost
- self.clang
- self.clang-tools
self.cmake
self.cppcheck
self.cscope
+ self.gcc
self.gdb
self.libcxx
self.libcxxabi
diff --git a/system/packages.nix b/system/packages.nix
index b8522f1..24ee01e 100644
--- a/system/packages.nix
+++ b/system/packages.nix
@@ -19,6 +19,7 @@
cacert
chromium
clamav
+ clang-overlay
clementine
cppOverlay
cryptsetup