diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-25 19:50:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-25 19:50:44 +0000 |
| commit | 729fb27ee8daa93bd1281e69fa1fc7e070e1dbc8 (patch) | |
| tree | 43528618c64ac0e0888eb654e337d00e1d2017a3 /pkgs/development/libraries/cairo | |
| parent | 2c0a4f46b95cdd7403ff35f9c5a2a4805fc051f2 (diff) | |
cairo: fix cross
I accidentally left this commented out when I did the cairo update
that switched the build system to Meson.
Fixes: 2c0a4f46b95c ("cairo: 1.16.0 -> 1.18.0")
Diffstat (limited to 'pkgs/development/libraries/cairo')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index b0ecf94e84fdf..017b4cf46a79c 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -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 = '' |