diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2020-05-02 13:14:14 +0900 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2020-05-02 07:42:14 +0200 |
| commit | 285bd2642bf66662c919e6d9fd91c28f82cb2a75 (patch) | |
| tree | b8281dd0b78950bb240a812fc42b53e22c2cec46 /pkgs/development/libraries | |
| parent | a0461d873ce0c2020aca2241526364a0c7c511f0 (diff) | |
directfb: fix build on 32-bit arm with glibc >= 2.28
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/directfb/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index f7545bb03d56c..d333b7866655a 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig, flux, zlib +{ stdenv, lib, fetchFromGitHub, fetchpatch +, autoreconfHook, perl, pkgconfig, flux, zlib , libjpeg, freetype, libpng, giflib , enableX11 ? true, xorg , enableSDL ? true, SDL }: @@ -14,6 +15,16 @@ stdenv.mkDerivation rec { sha256 = "0bs3yzb7hy3mgydrj8ycg7pllrd2b6j0gxj596inyr7ihssr3i0y"; }; + patches = [ + # Fixes build in "davinci" with glibc >= 2.28 + # The "davinci" module is only enabled on 32-bit arm. + # https://github.com/deniskropp/DirectFB/pull/17 + (fetchpatch { + url = "https://github.com/deniskropp/DirectFB/commit/3a236241bbec3f15b012b6f0dbe94353d8094557.patch"; + sha256 = "0rj3gv0zlb225sqjz04p4yagy4xacf3210aa8vra8i1f0fv0w4kw"; + }) + ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig flux ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] |