Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / nix


Commits:
e23d714c by Caleb Maclennan at 2024-03-04T11:53:13+03:00
upgpkg: 2.20.4-2; Adjust CXXFLAGS to work around upstream nix issue

See:

* https://gitlab.archlinux.org/archlinux/packaging/packages/nix/-/issues/1
* https://github.com/NixOS/nix/issues/10123

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = nix
        pkgdesc = A purely functional package manager
        pkgver = 2.20.4
-       pkgrel = 1
+       pkgrel = 2
        url = https://nixos.org/nix
        arch = x86_64
        license = LGPL


=====================================
PKGBUILD
=====================================
@@ -11,7 +11,7 @@ pkgbase=nix
 pkgname=('nix' 'nix-docs')
 pkgver=2.20.4
 _commit='d61e687f7285a2a3c9efa2e8bb132e01e5c8913d'
-pkgrel=1
+pkgrel=2
 pkgdesc='A purely functional package manager'
 arch=('x86_64')
 url='https://nixos.org/nix'
@@ -82,6 +82,10 @@ build() {
 
   autoreconf -vfi
 
+  # https://gitlab.archlinux.org/archlinux/packaging/packages/nix/-/issues/1
+  # https://github.com/NixOS/nix/issues/10123
+  export CXXFLAGS=$(sed 's/-Wp,-D_GLIBCXX_ASSERTIONS//' <<< $CXXFLAGS)
+
   ./configure \
     --prefix=/usr \
     --libexecdir="/usr/lib/$pkgname" \



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/nix/-/commit/e23d714cafb4d2f92502ee2d3f4ee093024fec9f

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/nix/-/commit/e23d714cafb4d2f92502ee2d3f4ee093024fec9f
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to