From 0e3c8a95daa8c8e5c6dd7d31083b015eaee0217a Mon Sep 17 00:00:00 2001 From: Niklas Hambüchen Date: Tue, 28 Jul 2020 15:00:06 +0200 Subject: musl: 1.1.24 -> 1.2.0 The libdrm `musl-ioctl.patch` is no longer necessary, see: https://github.com/openembedded/openembedded-core/commit/015e631cd18d982df03d4c829c0f8229a2face38 --- pkgs/development/libraries/libdrm/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'pkgs/development/libraries/libdrm') diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4296e56c74324..328c85830fbfa 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -17,15 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpthreadstubs libpciaccess ] ++ lib.optional withValgrind valgrind-light; - 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"; - }) - ]; + patches = [ ./cross-build-nm-path.patch ]; postPatch = '' for a in */*-symbol-check ; do -- cgit 1.4.1