diff options
-rw-r--r-- | pkgs/development/libraries/libdrm/default.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/musl/default.nix | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4296e56c743..328c85830fb 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 diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 422ad5c1cb5..67d08454a84 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation rec { pname = "musl"; - version = "1.1.24"; + version = "1.2.0"; src = fetchurl { url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz"; - sha256 = "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k"; + sha256 = "1s6lix02k1ijm4nmhzpmwzk5w6xfkhn70nvvk8zjs51r24cpppn6"; }; enableParallelBuilding = true; |