From 3114c599c5b237cf4abb1145a86545041fcf9c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 15 Mar 2021 14:47:46 +0100 Subject: [PATCH] boost-build: 2016.03 -> 4.4.1 The symlink bjam is created for backwards compatibility. See https://boostorg.github.io/build/manual/master/index.html#bbv2.faq.names. --- .../development/tools/boost-build/default.nix | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 8566edd2315..a821e661a60 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -1,34 +1,39 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, bison +}: stdenv.mkDerivation rec { pname = "boost-build"; - version = "2016.03"; + version = "4.4.1"; src = fetchFromGitHub { owner = "boostorg"; repo = "build"; rev = version; - sha256 = "1qw5marmp7z09nwcjlqrmqdg9b6myfqj3zvfz888x9mbidrmhn6p"; + sha256 = "1r4rwlq87ydmsdqrik4ly5iai796qalvw7603mridg2nwcbbnf54"; }; - hardeningDisable = [ "format" ]; - - patchPhase = '' - grep -r '/usr/share/boost-build' \ - | awk '{split($0,a,":"); print a[1];}' \ - | xargs sed -i "s,/usr/share/boost-build,$out/share/boost-build," - ''; + nativeBuildInputs = [ + bison + ]; buildPhase = '' + runHook preBuild ./bootstrap.sh + runHook postBuild ''; installPhase = '' - ./b2 install --prefix=$out + runHook preInstall + ./b2 install --prefix="$out" + ln -s b2 "$out/bin/bjam" + runHook postInstall ''; meta = with lib; { - homepage = "http://www.boost.org/boost-build2/"; + homepage = "https://www.boost.org/build/"; license = lib.licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ ivan-tkatchev ];