ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-14 08:31:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #323407 from trofi/libliftoff_0_4-fix-gcc-14

Browse Source 
libliftoff_0_4: backport gcc-14 build fix
This commit is contained in:
Aleksana 2024-08-05 18:33:16 +08:00 committed by GitHub
commit 9359a7ebba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/development/libraries/libliftoff/default.nix
View File

@ -1,9 +1,17 @@
{ callPackage, fetchFromGitLab, ... }:
{
callPackage,
fetchFromGitLab,
fetchpatch,
}:
let
mkVariant =
version: hash:
{
version,
hash,
patches ? [ ],
}:
callPackage ./generic.nix {
inherit version;
inherit version patches;
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "emersion";
@ -14,6 +22,21 @@ let
};
in
{
libliftoff_0_4 = mkVariant "0.4.1" "sha256-NPwhsd6IOQ0XxNQQNdaaM4kmwoLftokV86WYhoa5csY=";
libliftoff_0_5 = mkVariant "0.5.0" "sha256-PcQY8OXPqfn8C30+GAYh0Z916ba5pik8U0fVpZtFb5g=";
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=";
};
}

3
pkgs/development/libraries/libliftoff/generic.nix
View File

@ -3,11 +3,12 @@
, libdrm
, version
, src
, patches
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libliftoff";
inherit version src;
inherit version src patches;
nativeBuildInputs = [ meson pkg-config ninja ];