diff options
author | Griffin Smith <grfn@gws.fyi> | 2020-08-28T14·25-0400 |
---|---|---|
committer | glittershark <grfn@gws.fyi> | 2020-08-28T21·24+0000 |
commit | a7cd92770d3d2f35ae04713fb5e245536a1a95e9 (patch) | |
tree | 757fea8bcf73331454db57bdf609f96f8ceb849b /users/glittershark/system/pkgs/clang-tools | |
parent | fb0528c5dada2d3af6152b37a46e505e6bb2ac94 (diff) |
revert(glittershark): "Temporarily skip grfn's subtree" r/1728
This reverts commit 475d41f698415919093ca98f676ffcda218093ac. I'd like my derivations back, please. Changes necessary to get this working: - Don't depend on `nixpkgs` being in the NIX_PATH for my website - it's not necessary anyway since emacs 27 is mainline now - .skip-subtrees on things that shouldn't be evaluated anyway - Get rid of system/pkgs, and move the one thing in there that *wasn't* already in third_party (alsi) to third_party - Drop notifymuch for now - it's not working, and I'll probably get it landed in nixpkgs before I manage to get it working - Add __readTree = true to my systems so they get built. - explicitly disable ci for xanthous, which is failing to build and had been omitted previously Change-Id: I20f5e81d6eb7ffe040091a08d75d0cb15304f707 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1864 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'users/glittershark/system/pkgs/clang-tools')
-rw-r--r-- | users/glittershark/system/pkgs/clang-tools/default.nix | 24 | ||||
-rw-r--r-- | users/glittershark/system/pkgs/clang-tools/wrapper | 20 |
2 files changed, 0 insertions, 44 deletions
diff --git a/users/glittershark/system/pkgs/clang-tools/default.nix b/users/glittershark/system/pkgs/clang-tools/default.nix deleted file mode 100644 index 7c1009665eb6..000000000000 --- a/users/glittershark/system/pkgs/clang-tools/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs }: -with pkgs; - -runCommand "clang-tools" {} '' - mkdir -p $out/bin - export libc_includes="${stdenv.lib.getDev stdenv.cc.libc}/include" - export libcpp_includes="${llvmPackages.libcxx}/include/c++/v1" - - export clang=${llvmPackages.clang-unwrapped} - - echo $clang - - substituteAll ${./wrapper} $out/bin/clangd - chmod +x $out/bin/clangd - for tool in \ - clang-apply-replacements \ - clang-check \ - clang-format \ - clang-rename \ - clang-tidy - do - ln -s $out/bin/clangd $out/bin/$tool - done -'' diff --git a/users/glittershark/system/pkgs/clang-tools/wrapper b/users/glittershark/system/pkgs/clang-tools/wrapper deleted file mode 100644 index 949a4243e009..000000000000 --- a/users/glittershark/system/pkgs/clang-tools/wrapper +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -buildcpath() { - local path - while (( $# )); do - case $1 in - -isystem) - shift - path=$path${path:+':'}$1 - esac - shift - done - echo $path -} - -export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE}) -export CPATH=${CPATH}${CPATH:+':'}@libc_includes@ -export CPLUS_INCLUDE_PATH=@libcpp_includes@${CPATH:+':'}${CPATH} - -exec -a "$0" @clang@/bin/$(basename $0) "$@" |