John Ericson: can I have your opinion on this diff (staging-next -> staging)

diff --cc pkgs/development/compilers/llvm/git/libcxxabi/default.nix
index 441aba65166,2d4fe974c01..00000000000
--- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix
+++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix
@@@ -61,7 -80,7 +80,11 @@@ stdenv.mkDerivation rec 
  
    postInstall = ''
      mkdir -p "$dev/include"
++<<<<<<< HEAD
 +    install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include"
++=======
+     install -m 644 ../../${pname}/include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include"
++>>>>>>> origin/staging-next
    '';
  
    meta = llvm_meta // {

In reply to @pennae:matrix.eno.space
currently playing around with a mkDerivation' :: (Attrs -> Attrs) -> Attrs -> Drv. could be useful to solve eg the rust overrideAttrs problem (where rust would use mkDerivation' to do rust-specific processing to the args before passing them on, and regular mkDerivation would just pass id). is this something? is there something other than stdenv adapters that could turn into a problem?

npm ERR! Log files were not written due to an error writing to the directory: /homeless-shelter/.npm/_logs
npm ERR! You can rerun the command with `--loglevel=verbose` to see the logs in your terminal
+ exitHandler
+ exitCode=226
+ set +e
+ '[' -n '' ']'
+ ((  226 != 0  ))
+ runHook failureHook
+ local hookName=failureHook
+ shift
+ local 'hooksSlice=failureHooks[@]'
+ local hook
+ for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"}
+ _eval '_callImplicitHook 0 failureHook'
+ declare -F '_callImplicitHook 0 failureHook'
+ eval '_callImplicitHook 0 failureHook'
++ _callImplicitHook 0 failureHook
++ local def=0
++ local hookName=failureHook
++ declare -F failureHook
++ type -p failureHook
++ '[' -n '' ']'
++ return 0
+ return 0
+ '[' -n '' ']'
+ return 226
   Compiling proc-macro2 v1.0.43

trap "exitHandler" EXIT

If a sigspec is 0 or EXIT, arg is executed when the shell exits.