Commit ffd9d8f0 authored by Gaetan Lepage's avatar Gaetan Lepage Committed by Gaétan Lepage
Browse files

justbuild: format

parent ed47a0bb
Loading
Loading
Loading
Loading
+57 −55
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@
  curl,
  libarchive,
}:
let stdenv = gccStdenv;
let
  stdenv = gccStdenv;
in
stdenv.mkDerivation rec {
  pname = "justbuild";
@@ -47,8 +48,7 @@ stdenv.mkDerivation rec {
    hash = "sha256-W7awJTzPZLU9bHJJYlp+P2w7xkAqvVLTd4v6SCWHA6A=";
  };

  nativeBuildInputs =
    [
  nativeBuildInputs = [
    # Tools for the bootstrap process
    jq
    pkg-config
@@ -81,7 +81,8 @@ stdenv.mkDerivation rec {
    python3
  ];

  postPatch = ''
  postPatch =
    ''
      sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py
      sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py
      jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_25}"' etc/repos.json > etc/repos.json.patched
@@ -90,11 +91,13 @@ stdenv.mkDerivation rec {
      mv etc/repos.json.patched etc/repos.json
      jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched
      mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS
  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
    ''
    + lib.optionalString stdenv.hostPlatform.isDarwin ''
      sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py
    '';

  /* The build phase follows the bootstrap procedure that is explained in
  /*
    The build phase follows the bootstrap procedure that is explained in
    https://github.com/just-buildsystem/justbuild/blob/master/INSTALL.md

    The bootstrap of the just binary depends on two proto libraries, which are
@@ -108,7 +111,6 @@ stdenv.mkDerivation rec {
    The extra build flags (ADD_CFLAGS and ADD_CXXFLAGS) are only needed in the
    current version of just, the next release will contain a fix from upstream.
    https://github.com/just-buildsystem/justbuild/commit/5abcd4140a91236c7bda1c21ce69e76a28da7c8a

  */

  buildPhase = ''