moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

nix: fix for glibc 2.26 and fix primary groups of nixbldN users.

Browse source
This commit is contained in:
Leah Neukirchen 2017-08-15 14:33:53 +02:00
parent 316516ddc3
commit 0460064b5f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/nix/template
View file

@ -1,7 +1,7 @@
# Template file for 'nix' # Template file for 'nix'
pkgname=nix pkgname=nix
version=1.11.4 version=1.11.4
revision=3 revision=4
build_style=gnu-configure build_style=gnu-configure
# Use /nix/var as suggested by the official Manual. # Use /nix/var as suggested by the official Manual.
configure_args="--localstatedir=/nix/var" configure_args="--localstatedir=/nix/var"
@ -14,8 +14,7 @@ makedepends="bzip2-devel gc-devel libcurl-devel liblzma-devel libressl-devel
conf_files="/etc/nix/nix.conf" conf_files="/etc/nix/nix.conf"
# Create required build users/groups. # Create required build users/groups.
system_groups="nixbld" system_groups="nixbld"
system_accounts="nixbld1" for f in {1..9}; do
for f in {2..9}; do
system_accounts+=" nixbld${f}" system_accounts+=" nixbld${f}"
eval export nixbld\${f}_pgroup="nixbld" eval export nixbld\${f}_pgroup="nixbld"
done done
@ -39,6 +38,7 @@ distfiles="http://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz"
checksum=937779ed2efaa3dec210250635401980acb99a6fea6d7374fbaea78231b36d34 checksum=937779ed2efaa3dec210250635401980acb99a6fea6d7374fbaea78231b36d34
pre_configure() { pre_configure() {
sed -i 's/ucontext/struct ucontext_t/g' src/libmain/stack.cc
sed -i '/^CFLAGS=/d;/^CXXFLAGS=/d' configure sed -i '/^CFLAGS=/d;/^CXXFLAGS=/d' configure
echo "GLOBAL_LDFLAGS += $LDFLAGS" >>mk/lib.mk echo "GLOBAL_LDFLAGS += $LDFLAGS" >>mk/lib.mk
} }