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

cairo: fix cross

Browse Source 
I accidentally left this commented out when I did the cairo update
that switched the build system to Meson.

Fixes: 2c0a4f46b9 ("cairo: 1.16.0 -> 1.18.0")
This commit is contained in:
Alyssa Ross
2023-10-25 19:50:44 +00:00
parent 2c0a4f46b9
commit 729fb27ee8
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/cairo/default.nix
+12 -12
View File
@@ -60,18 +60,18 @@ in {
(lib.mesonEnable "tests" finalAttrs.doCheck)
(lib.mesonEnable "xlib" x11Support)
(lib.mesonEnable "xcb" xcbSupport)
# ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
# "--cross-file=${builtins.toFile "cross-file.conf" ''
# [properties]
# ipc_rmid_deferred_release = ${
# {
# linux = "true";
# freebsd = "true";
# netbsd = "false";
# }.${stdenv.hostPlatform.parsed.kernel.name} or
# throw "Unknown value for ipc_rmid_deferred_release"
# }
# ''}"
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
"--cross-file=${builtins.toFile "cross-file.conf" ''
[properties]
ipc_rmid_deferred_release = ${
{
linux = "true";
freebsd = "true";
netbsd = "false";
}.${stdenv.hostPlatform.parsed.kernel.name} or
(throw "Unknown value for ipc_rmid_deferred_release")
}
''}"
];
preConfigure = ''