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

musl: 1.1.24 -> 1.2.0

Browse Source 
The libdrm `musl-ioctl.patch` is no longer necessary, see:
015e631cd1
This commit is contained in:
Niklas Hambüchen 2020-07-28 15:00:06 +02:00 committed by Alyssa Ross
parent 65406ee980
commit 0e3c8a95da
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,15 +17,7 @@ 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

4
pkgs/os-specific/linux/musl/default.nix
View File

@ -35,11 +35,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "musl"; pname = "musl";
version = "1.1.24"; version = "1.2.0";
src = fetchurl { src = fetchurl {
url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz"; url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz";
sha256 = "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k"; sha256 = "1s6lix02k1ijm4nmhzpmwzk5w6xfkhn70nvvk8zjs51r24cpppn6";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;