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

build2: 0.15.0 -> 0.16.0

Browse Source
This commit is contained in:
Ryan Burns
2024-01-02 21:02:50 -08:00
parent 5a46feaabc
commit b9ed2eb5ec
3 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/build-managers/build2/default.nix
+2 -4
View File
@@ -17,7 +17,7 @@ let
in
stdenv.mkDerivation rec {
pname = "build2";
version = "0.15.0";
version = "0.16.0";
outputs = [ "out" "dev" "doc" "man" ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz";
sha256 = "07369gw6zlad6nk29564kj17yp145l3dzbgrx04pyiyl1s84aa1r";
hash = "sha256-ZK4+UACsAs51bC1dE0sIxmCiHlH3pYGPWJNsl61oSOY=";
};
patches = [
@@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
./remove-config-store-paths.patch
# Pick up sysdirs from NIX_LDFLAGS
./nix-ldflags-sysdirs.patch
./remove-const-void-param.patch
];
strictDeps = true;
pkgs/development/tools/build-managers/build2/remove-config-store-paths.patch
+11 -13
View File
@@ -1,16 +1,14 @@
--- a/libbuild2/buildfile
+++ b/libbuild2/buildfile
@@ -83,9 +83,13 @@ config/cxx{host-config}: config/in{host-config}
# want it).
#
build2_config = $regex.replace_lines( \
+ $regex.replace_lines( \
$config.save(), \
'^( *(#|(config\.(test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \
[null], \
+ return_lines), \
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
+ [null], \
return_lines)
@@ -86,8 +86,11 @@ build2_config_lines = [strings]
host_config_lines = [strings]
# Also preserve config.version.
for l: $regex.replace_lines( \
+ $regex.replace_lines( \
$config.save(), \
'^( *(#|(config\.(test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \
+ [null], return_lines), \
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
[null])
{
build2_config_lines += $l
pkgs/development/tools/build-managers/build2/remove-const-void-param.patch
-11
View File
@@ -1,11 +0,0 @@
--- a/libbuild2/cc/pkgconfig-libpkgconf.cxx
+++ b/libbuild2/cc/pkgconfig-libpkgconf.cxx
@@ -84,7 +84,7 @@ namespace build2
static bool
pkgconf_error_handler (const char* msg,
const pkgconf_client_t*,
- const void*)
+ void*)
{
error << runtime_error (msg); // Sanitize the message (trailing dot).
return true;