colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

justbuild: Fix build

Browse Source
This commit is contained in:
Christian Lütke Stetzkamp 2024-04-09 20:05:23 +02:00
parent db5b8a90e4
commit 5c01177666
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/by-name/ju/justbuild/package.nix
View File

@ -11,7 +11,7 @@
openssl, openssl,
pkg-config, pkg-config,
protobuf_23, protobuf_24,
grpc, grpc,
pandoc, pandoc,
python3, python3,
@ -75,19 +75,21 @@ stdenv.mkDerivation rec {
grpc grpc
libgit2 libgit2
openssl openssl
# Using protobuf 23 because this is the same version upstream currently # Using protobuf 24 because the current version of grpc is build using
# uses for bundled builds # protobuf 24 and therefore the older protobuf version causes errors
# during build.
# Upstream currently uses protobuf 23 for bundled builds
# For future updates: The currently used version can be found in the file # For future updates: The currently used version can be found in the file
# etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json
# under the key .repositories.protobuf # under the key .repositories.protobuf
protobuf_23 protobuf_24
python3 python3
]; ];
postPatch = '' postPatch = ''
sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py 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 sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py
jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_23}"' etc/repos.json > etc/repos.json.patched jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_24}"' etc/repos.json > etc/repos.json.patched
mv etc/repos.json.patched etc/repos.json mv etc/repos.json.patched etc/repos.json
jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched
mv etc/repos.json.patched etc/repos.json mv etc/repos.json.patched etc/repos.json
@ -170,7 +172,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
broken = true; # last successful build 2024-01-26 broken = stdenv.isDarwin;
description = "a generic build tool"; description = "a generic build tool";
homepage = "https://github.com/just-buildsystem/justbuild"; homepage = "https://github.com/just-buildsystem/justbuild";
license = licenses.asl20; license = licenses.asl20;