diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-11 11:45:23 -0400 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-11 22:54:48 -0500 |
commit | b5d529d52f956a9830d2aa3b1042071216c30d86 (patch) | |
tree | 93bb8ba45379c24663f9d136f5a64e8e8aa9617f /pkgs/development/tools/xcbuild/toolchains.nix | |
parent | 0edb441a0ee44bea1bf448653d2b11679fdcd287 (diff) |
xcbuild: cleanup
Diffstat (limited to 'pkgs/development/tools/xcbuild/toolchains.nix')
-rw-r--r-- | pkgs/development/tools/xcbuild/toolchains.nix | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/development/tools/xcbuild/toolchains.nix index 01a8fbdb0b065..59e009a433868 100644 --- a/pkgs/development/tools/xcbuild/toolchains.nix +++ b/pkgs/development/tools/xcbuild/toolchains.nix @@ -1,4 +1,4 @@ -{ runCommand, toolchainName, fetchurl, makeWrapper, stdenv +{ runCommand, toolchainName, fetchurl, stdenv , buildPackages, lib, writeText }: let @@ -20,52 +20,52 @@ let }; in -runCommand "Toolchains" { - nativeBuildInputs = [ makeWrapper ]; -} ('' +runCommand "Toolchains" {} ('' toolchain=$out/XcodeDefault.xctoolchain mkdir -p $toolchain install -D ${writeText "ToolchainInfo.plist" (toPlist {} ToolchainInfo)} $toolchain/ToolchainInfo.plist - mkdir -p $toolchain/usr/include - mkdir -p $toolchain/usr/lib - mkdir -p $toolchain/usr/libexec - mkdir -p $toolchain/usr/share - mkdir -p $toolchain/usr/bin + ln -s $toolchain $toolchain/usr + + mkdir -p $toolchain/include + mkdir -p $toolchain/lib + mkdir -p $toolchain/libexec + mkdir -p $toolchain/share + mkdir -p $toolchain/bin for bin in ${getBin stdenv.cc}/bin/*; do - ln -s $bin $toolchain/usr/bin + ln -s $bin $toolchain/bin done for bin in ${getBin stdenv.cc.bintools.bintools}/bin/*; do - if ! [ -e "$toolchain/usr/bin/$(basename $bin)" ]; then - ln -s $bin $toolchain/usr/bin + if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then + ln -s $bin $toolchain/bin fi done - ln -s ${buildPackages.yacc}/bin/yacc $toolchain/usr/bin/yacc - ln -s ${buildPackages.yacc}/bin/bison $toolchain/usr/bin/bison - ln -s ${buildPackages.flex}/bin/flex $toolchain/usr/bin/flex - ln -s ${buildPackages.flex}/bin/flex++ $toolchain/usr/bin/flex++ - ln -s $toolchain/bin/flex $toolchain/usr/bin/lex + ln -s ${buildPackages.yacc}/bin/yacc $toolchain/bin/yacc + ln -s ${buildPackages.yacc}/bin/bison $toolchain/bin/bison + ln -s ${buildPackages.flex}/bin/flex $toolchain/bin/flex + ln -s ${buildPackages.flex}/bin/flex++ $toolchain/bin/flex++ + ln -s $toolchain/bin/flex $toolchain/bin/lex - ln -s ${buildPackages.m4}/bin/m4 $toolchain/usr/bin/m4 - ln -s $toolchain/usr/bin/m4 $toolchain/usr/bin/gm4 + ln -s ${buildPackages.m4}/bin/m4 $toolchain/bin/m4 + ln -s $toolchain/bin/m4 $toolchain/bin/gm4 - ln -s ${buildPackages.unifdef}/bin/unifdef $toolchain/usr/bin/unifdef - ln -s ${buildPackages.unifdef}/bin/unifdefall $toolchain/usr/bin/unifdefall + ln -s ${buildPackages.unifdef}/bin/unifdef $toolchain/bin/unifdef + ln -s ${buildPackages.unifdef}/bin/unifdefall $toolchain/bin/unifdefall - ln -s ${buildPackages.gperf}/bin/gperf $toolchain/usr/bin/gperf - ln -s ${buildPackages.indent}/bin/indent $toolchain/usr/bin/indent - ln -s ${buildPackages.ctags}/bin/ctags $toolchain/usr/bin/ctags + ln -s ${buildPackages.gperf}/bin/gperf $toolchain/bin/gperf + ln -s ${buildPackages.indent}/bin/indent $toolchain/bin/indent + ln -s ${buildPackages.ctags}/bin/ctags $toolchain/bin/ctags '' + optionalString stdenv.isDarwin '' for bin in ${getBin buildPackages.darwin.cctools}/bin/*; do - if ! [ -e "$toolchain/usr/bin/$(basename $bin)" ]; then - ln -s $bin $toolchain/usr/bin + if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then + ln -s $bin $toolchain/bin fi done - ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $toolchain/usr/bin - ln -s ${mkdep-darwin-src} $toolchain/usr/bin/mkdep + ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $toolchain/bin + ln -s ${mkdep-darwin-src} $toolchain/bin/mkdep '') |