diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-08 13:58:27 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-08 13:58:27 -0500 |
| commit | f7fdc997bf0748a49dea2e0e5451a21da02ee4c1 (patch) | |
| tree | ae2a2f69bf1be50e516f5e945559d3a3b35bb32d /pkgs/build-support | |
| parent | 784c3dc0f96ca85561e3a6805b0261d4bfb9f7e0 (diff) | |
| parent | afa48f16f265fd3e88073bca7929e1e103bd3dc3 (diff) | |
| download | nixlib-f7fdc997bf0748a49dea2e0e5451a21da02ee4c1.tar nixlib-f7fdc997bf0748a49dea2e0e5451a21da02ee4c1.tar.gz nixlib-f7fdc997bf0748a49dea2e0e5451a21da02ee4c1.tar.bz2 nixlib-f7fdc997bf0748a49dea2e0e5451a21da02ee4c1.tar.lz nixlib-f7fdc997bf0748a49dea2e0e5451a21da02ee4c1.tar.xz nixlib-f7fdc997bf0748a49dea2e0e5451a21da02ee4c1.tar.zst nixlib-f7fdc997bf0748a49dea2e0e5451a21da02ee4c1.zip | |
Merge commit 'afa48f16f265fd3e88073bca7929e1e103bd3dc3' into bash-no-undef-vars
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/nix-prefetch-github/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 8 |
2 files changed, 5 insertions, 32 deletions
diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/pkgs/build-support/nix-prefetch-github/default.nix deleted file mode 100644 index 10a6daaf53f7..000000000000 --- a/pkgs/build-support/nix-prefetch-github/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ python3 -, fetchFromGitHub -, stdenv -}: - -python3.pkgs.buildPythonApplication rec { - pname = "nix-prefetch-github"; - version = "2.3.1"; - - src = fetchFromGitHub { - owner = "seppeljordan"; - repo = "nix-prefetch-github"; - rev = "v${version}"; - sha256 = "13wvq13iiva97a16kahfpxar5ppb015nnbn7d4v9s9jyxdickc2c"; - }; - - propagatedBuildInputs = with python3.pkgs; [ - attrs - click - effect - jinja2 - ]; - meta = with stdenv.lib; { - description = "Prefetch sources from github"; - homepage = https://github.com/seppeljordan/nix-prefetch-github; - license = licenses.gpl3; - maintainers = [ maintainers.seppeljordan ]; - }; -} diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 8b41d992d1ef..f0f949b22056 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -18,6 +18,7 @@ verifyCargoDeps ? false , buildType ? "release" , meta ? {} +, target ? null , cargoVendorDir ? null , ... } @ args: @@ -50,12 +51,13 @@ let rustHostConfig = { x86_64-pc-mingw32 = "x86_64-pc-windows-gnu"; }.${hostConfig} or hostConfig; + rustTarget = if target == null then rustHostConfig else target; ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; - releaseDir = "target/${rustHostConfig}/${buildType}"; + releaseDir = "target/${rustTarget}/${buildType}"; in stdenv.mkDerivation (args // { @@ -88,7 +90,7 @@ stdenv.mkDerivation (args // { [target."${stdenv.buildPlatform.config}"] "linker" = "${ccForBuild}" ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' - [target."${rustHostConfig}"] + [target."${rustTarget}"] "linker" = "${ccForHost}" ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633 stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' @@ -133,7 +135,7 @@ stdenv.mkDerivation (args // { "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \ cargo build \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ - --target ${rustHostConfig} \ + --target ${rustTarget} \ --frozen ${concatStringsSep " " cargoBuildFlags} ) |