diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-14 10:22:33 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-14 15:05:18 -0400 |
commit | 1eacf21bd4cf88fe284bb1687e35a52389e6caac (patch) | |
tree | 0dd42bb6a043b6b02228316fa73fb771f9c6a92e /pkgs/development/compilers/llvm/6 | |
parent | 3e3a9e661d7ef83f9dfc26d948a12f8ee1334f6d (diff) | |
download | nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.tar nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.tar.gz nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.tar.bz2 nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.tar.lz nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.tar.xz nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.tar.zst nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.zip |
darwin bootstrapping: Avoid overriding aliases for LLVM
Respect the fix points and aliases by overriding originals.
Diffstat (limited to 'pkgs/development/compilers/llvm/6')
-rw-r--r-- | pkgs/development/compilers/llvm/6/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index bbac21ef6796..8fe68bad213d 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -21,7 +21,7 @@ let let drv-manpages = drv.override { enableManpages = true; }; in drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { @@ -71,9 +71,9 @@ let lld = callPackage ./lld.nix {}; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { @@ -88,6 +88,6 @@ let libcxxabi = callPackage ./libc++abi.nix {}; openmp = callPackage ./openmp.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools |