BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkgsMusl.directfb: unbreak (#228345)

Browse source
This commit is contained in:
Yureka 2023-04-26 20:45:46 +02:00 committed by GitHub
parent e494bbff1f
commit 2a75232c11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/development/libraries/directfb/default.nix
View file

@ -23,6 +23,16 @@ stdenv.mkDerivation rec {
url = "https://github.com/deniskropp/DirectFB/commit/3a236241bbec3f15b012b6f0dbe94353d8094557.patch";
sha256 = "0rj3gv0zlb225sqjz04p4yagy4xacf3210aa8vra8i1f0fv0w4kw";
})
# Fixes for build of `pkgsMusl.directfb`; applied everywhere to prevent patchrot
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/community/directfb/0001-directfb-fix-musl-compile.patch?id=f8158258493fc0c3eb5de2302e40f4bc44ecfb09";
sha256 = "sha256-hmwzbaXu30ZkAqUn1NmvtlJkM6ctddKcO4hxh+1LSS4=";
})
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/community/directfb/0002-Fix-musl-PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP-comp.patch?id=f8158258493fc0c3eb5de2302e40f4bc44ecfb09";
sha256 = "sha256-j3+mcP6hV9LKuba1GOdcM1cZfmXuJtRgx4vE484jIns=";
})
];
postPatch = ''
@ -31,6 +41,12 @@ stdenv.mkDerivation rec {
# if switching to cmake then a similar substitution has to be done
substituteInPlace src/core/Makefile.am \
--replace '`date -u "+%Y-%m-%d %H:%M"`' "`date -u \"+%Y-%m-%d %H:%M\" --date="@''${SOURCE_DATE_EPOCH}"`"
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
# Specifically patch out two drivers that have build errors with musl libc,
# while leaving the rest of the default selection enabled
substituteInPlace configure.in \
--replace checkfor_lirc={yes,no} \
--replace checkfor_matrox={yes,no}
'';
nativeBuildInputs = [ autoreconfHook perl pkg-config flux ];
@ -53,8 +69,10 @@ stdenv.mkDerivation rec {
"--enable-mmx"
"--enable-sse"
"--with-software"
"--with-smooth-scaling"
] ++ lib.optional enableX11 "--enable-x11";
]
++ lib.optional (!stdenv.hostPlatform.isMusl) "--with-smooth-scaling"
++ lib.optional enableX11 "--enable-x11"
;
# Disable parallel building as parallel builds fail due to incomplete
# depends between autogenerated CoreSlave.h and it's include sites:
@ -83,7 +101,5 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
broken = stdenv.hostPlatform.isMusl; # Broken at 2022-02-25
# See https://github.com/NixOS/nixpkgs/issues/218274
};
}