MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

distrobuilder: fix build w/glibc-2.36

Browse source 
Failing Hydra build: https://hydra.nixos.org/build/193332774
This commit is contained in:
Maximilian Bosch 2022-10-09 10:42:26 +02:00
parent 2768c81adc
commit c5aabf6392
No known key found for this signature in database
GPG key ID: 9A6EEA275CA5BE0A
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/tools/virtualization/distrobuilder/default.nix
View file

@ -8,6 +8,7 @@
, gnutar , gnutar
, squashfsTools , squashfsTools
, debootstrap , debootstrap
, fetchpatch
}: }:
let let
@ -23,7 +24,7 @@ buildGoModule rec {
pname = "distrobuilder"; pname = "distrobuilder";
version = "2.1"; version = "2.1";
vendorSha256 = "sha256-6LsJ6nZIo+aC8kvF+1aZD1WoXNTj9siB8QhKPVA6MSc="; vendorSha256 = "sha256-yRMsf8KfpNmVUX4Rn4ZPLUPFZCT/g78MKAfgbFDPVkE=";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxc"; owner = "lxc";
@ -35,6 +36,21 @@ buildGoModule rec {
buildInputs = bins; buildInputs = bins;
patches = [
# go.mod update: needed to to include a newer lxd which contains
# https://github.com/lxc/lxd/commit/d83f061a21f509d42b7a334b97403d2a019a7b52
# which is needed to fix the build w/glibc-2.36.
(fetchpatch {
url = "https://github.com/lxc/distrobuilder/commit/5346bcc77dd7f141a36a8da851f016d0b929835e.patch";
sha256 = "sha256-H6cSbY0v/FThx72AvoAvUCs2VCYN/PQ0W4H82mQQ3SI=";
})
# Fixup to keep it building after go.mod update.
(fetchpatch {
url = "https://github.com/lxc/distrobuilder/commit/2c8cbfbf603e7446efce9f30812812336ccf4f2c.patch";
sha256 = "sha256-qqofghcHGosR2qycGb02c8rwErFyRRhsRKdQfyah8Ds=";
})
];
# tests require a local keyserver (mkg20001/nixpkgs branch distrobuilder-with-tests) but gpg is currently broken in tests # tests require a local keyserver (mkg20001/nixpkgs branch distrobuilder-with-tests) but gpg is currently broken in tests
doCheck = false; doCheck = false;