diff options
author | Niklas Hambüchen <mail@nh2.me> | 2020-07-28 15:00:06 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-08-16 13:10:50 +0000 |
commit | 0e3c8a95daa8c8e5c6dd7d31083b015eaee0217a (patch) | |
tree | e6f18b365c6fdb1612462a79eddab7ed9e1bf90d /pkgs/development/libraries/libdrm | |
parent | 65406ee980431f47dbe1fc3a40214c7f0593139e (diff) |
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
Diffstat (limited to 'pkgs/development/libraries/libdrm')
-rw-r--r-- | pkgs/development/libraries/libdrm/default.nix | 10 |
1 files changed, 1 insertions, 9 deletions
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 |