mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 22:20:51 +00:00
Code Issues Wiki Activity

xcbuild: fix toolchain on Linux

Browse source
This commit is contained in:
Matthew Bauer 2016-11-10 14:53:28 -06:00
parent 0b6bfa49d5
commit 437bdc5e4b
No known key found for this signature in database
GPG key ID: E04D0AD9469141C3
3 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
pkgs/development/tools/xcbuild/toolchain.nix
View file

@ -1,5 +1,5 @@
{stdenv, writeText, toolchainName, xcbuild
, cc, llvm, cctools, gcc, bootstrap_cmds, binutils
, llvm, cctools, gcc, bootstrap_cmds, binutils
, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}:
let
@ -13,7 +13,11 @@ in
stdenv.mkDerivation {
name = "nixpkgs.xctoolchain";
buildInputs = [ xcbuild makeWrapper ];
propagatedBuildInputs = [ cc cctools llvm gcc bootstrap_cmds binutils yacc flex m4 unifdef gperf indent ];
propagatedBuildInputs = [ llvm gcc yacc flex m4 unifdef gperf indent ]
++ stdenv.lib.optionals stdenv.isDarwin [ cctools bootstrap_cmds binutils ];
## cctools should build on Linux but it doesn't currentl
buildCommand = ''
mkdir -p $out
plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)}
@ -25,33 +29,12 @@ stdenv.mkDerivation {
mkdir -p $out/usr/bin
cd $out/usr/bin
ln -s ${cc}/bin/cpp
ln -s ${cc}/bin/c++
ln -s ${cc}/bin/cc
ln -s ${stdenv.cc}/bin/cpp
ln -s ${stdenv.cc}/bin/c++
ln -s ${stdenv.cc}/bin/cc
ln -s c++ clang++
ln -s cc clang
ln -s ${cctools}/bin/ar
ln -s ${cctools}/bin/as
ln -s ${cctools}/bin/nm
ln -s ${cctools}/bin/nmedit
ln -s ${cctools}/bin/ld
ln -s ${cctools}/bin/libtool
ln -s ${cctools}/bin/strings
ln -s ${cctools}/bin/strip
ln -s ${cctools}/bin/install_name_tool
ln -s ${cctools}/bin/bitcode_strip
ln -s ${cctools}/bin/codesign_allocate
ln -s ${cctools}/bin/dsymutil
ln -s ${cctools}/bin/dyldinfo
ln -s ${cctools}/bin/otool
ln -s ${cctools}/bin/unwinddump
ln -s ${cctools}/bin/size
ln -s ${cctools}/bin/segedit
ln -s ${cctools}/bin/pagestuff
ln -s ${cctools}/bin/ranlib
ln -s ${cctools}/bin/redo_prebinding
ln -s ${llvm}/bin/llvm-cov
ln -s ${llvm}/bin/llvm-dsymutil
ln -s ${llvm}/bin/llvm-dwarfdump
@ -74,14 +57,35 @@ stdenv.mkDerivation {
ln -s ${unifdef}/bin/unifdef
ln -s ${unifdef}/bin/unifdefall
ln -s ${bootstrap_cmds}/bin/mig
ln -s ${gperf}/bin/gperf
ln -s ${gcc}/bin/gcov
ln -s ${gcc}/bin/mkdep
ln -s ${indent}/bin/indent
ln -s ${binutils}/bin/lipo
ln -s ${ctags}/bin/ctags
'' + stdenv.lib.optionalString stdenv.isDarwin ''
ln -s ${bootstrap_cmds}/bin/mig
ln -s ${binutils}/bin/lipo
ln -s ${cctools}/bin/ar
ln -s ${cctools}/bin/as
ln -s ${cctools}/bin/nm
ln -s ${cctools}/bin/nmedit
ln -s ${cctools}/bin/ld
ln -s ${cctools}/bin/libtool
ln -s ${cctools}/bin/strings
ln -s ${cctools}/bin/strip
ln -s ${cctools}/bin/install_name_tool
ln -s ${cctools}/bin/bitcode_strip
ln -s ${cctools}/bin/codesign_allocate
ln -s ${cctools}/bin/dsymutil
ln -s ${cctools}/bin/dyldinfo
ln -s ${cctools}/bin/otool
ln -s ${cctools}/bin/unwinddump
ln -s ${cctools}/bin/size
ln -s ${cctools}/bin/segedit
ln -s ${cctools}/bin/pagestuff
ln -s ${cctools}/bin/ranlib
ln -s ${cctools}/bin/redo_prebinding
'';
}

2
pkgs/development/tools/xcbuild/wrapper.nix
View file

@ -12,7 +12,7 @@ let
};
toolchain = callPackage ./toolchain.nix {
inherit cctools bootstrap_cmds toolchainName xcbuild binutils;
inherit cctools bootstrap_cmds toolchainName xcbuild binutils stdenv;
};
sdk = callPackage ./sdk.nix {

1
pkgs/top-level/all-packages.nix
View file

@ -6435,6 +6435,7 @@ in
xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
inherit (darwin) cctools bootstrap_cmds binutils;
stdenv = clangStdenv;
};
xmlindent = callPackage ../development/web/xmlindent {};