72b09cfd89
Without the change `gcc-14` build fails as:
$ nix build --impure --expr 'with import ./. {}; libliftoff_0_4.override { stdenv = gcc14Stdenv; }'
...
libliftoff> ../layer.c: In function 'liftoff_layer_create':
libliftoff> ../layer.c:20:48: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
libliftoff> 20 | layer->candidate_planes = calloc(sizeof(layer->candidate_planes[0]),
libliftoff> | ^
43 lines
1.0 KiB
Nix
43 lines
1.0 KiB
Nix
{
|
|
callPackage,
|
|
fetchFromGitLab,
|
|
fetchpatch,
|
|
}:
|
|
let
|
|
mkVariant =
|
|
{
|
|
version,
|
|
hash,
|
|
patches ? [ ],
|
|
}:
|
|
callPackage ./generic.nix {
|
|
inherit version patches;
|
|
src = fetchFromGitLab {
|
|
domain = "gitlab.freedesktop.org";
|
|
owner = "emersion";
|
|
repo = "libliftoff";
|
|
rev = "v${version}";
|
|
inherit hash;
|
|
};
|
|
};
|
|
in
|
|
{
|
|
libliftoff_0_4 = mkVariant {
|
|
version = "0.4.1";
|
|
hash = "sha256-NPwhsd6IOQ0XxNQQNdaaM4kmwoLftokV86WYhoa5csY=";
|
|
patches = [
|
|
# Pull gcc-14 fix:
|
|
# https://gitlab.freedesktop.org/emersion/libliftoff/-/merge_requests/78
|
|
(fetchpatch {
|
|
name = "libliftoff-gcc-14-calloc.patch";
|
|
url = "https://gitlab.freedesktop.org/emersion/libliftoff/-/commit/29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e.patch";
|
|
hash = "sha256-Y8x1RK3o/I9bs/ZOLeC4t9AIK78l0QnlBWHhiVC+sz8=";
|
|
})
|
|
];
|
|
};
|
|
libliftoff_0_5 = mkVariant {
|
|
version = "0.5.0";
|
|
hash = "sha256-PcQY8OXPqfn8C30+GAYh0Z916ba5pik8U0fVpZtFb5g=";
|
|
};
|
|
}
|