JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #69270 from matthewbauer/fix-libdrm-musl

Browse Source 
libdrm: Add patch to fix musl build. Fixes #66441
This commit is contained in:
Matthew Bauer 2019-09-22 22:57:49 -04:00 committed by GitHub
commit 783f92573c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libdrm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess { stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess
, withValgrind ? valgrind-light.meta.available, valgrind-light , withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,7 +17,15 @@ stdenv.mkDerivation rec {
buildInputs = [ libpthreadstubs libpciaccess ] buildInputs = [ libpthreadstubs libpciaccess ]
++ lib.optional withValgrind valgrind-light; ++ lib.optional withValgrind valgrind-light;
patches = [ ./cross-build-nm-path.patch ]; patches = [ ./cross-build-nm-path.patch ] ++
lib.optionals stdenv.hostPlatform.isMusl [
# Fix tests not building on musl because they use the glibc-specific
# (non-POSIX) `ioctl()` type signature. See #66441.
(fetchpatch {
url = "https://raw.githubusercontent.com/openembedded/openembedded-core/30a2af80f5f8c8ddf0f619e4f50451b02baa22dd/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch";
sha256 = "0rdmh4k5kb80hhk1sdhlil30yf0s8d8w0fnq0hzyvw3ir1mki3by";
})
];
postPatch = '' postPatch = ''
for a in */*-symbol-check ; do for a in */*-symbol-check ; do