Skip to content

Commit

Permalink
contrib/nix: work around clang errors in unicode gem
Browse files Browse the repository at this point in the history
Same new clang error as in ncursesw, but in this case it's just missing
casts, not misdeclared arguments. There's no clear upstream to publish
a proper fix so let's just suppress the error for now so that the gem
build on MacOS can succeed.
  • Loading branch information
danc86 committed Apr 14, 2024
1 parent 6f91b06 commit 3c63d7c
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 0 deletions.
7 changes: 7 additions & 0 deletions contrib/nix/ruby2.4-shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ let
})
];
};
# Workaround for a new error in clang 16 (MacOS):
# https://github.com/blackwinter/unicode/pull/11
unicode = attrs: {
buildFlags = [
"--with-cflags=-Wno-incompatible-function-pointer-types"
];
};
# Workaround: remove rake from nativeBuildInputs, otherwise it causes
# xapian-bindings to build against the default Ruby version
# instead of our chosen version.
Expand Down
7 changes: 7 additions & 0 deletions contrib/nix/ruby2.5-shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ let
})
];
};
# Workaround for a new error in clang 16 (MacOS):
# https://github.com/blackwinter/unicode/pull/11
unicode = attrs: {
buildFlags = [
"--with-cflags=-Wno-incompatible-function-pointer-types"
];
};
# Workaround: remove rake from nativeBuildInputs, otherwise it causes
# xapian-bindings to build against the default Ruby version
# instead of our chosen version.
Expand Down
7 changes: 7 additions & 0 deletions contrib/nix/ruby2.6-shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ let
})
];
};
# Workaround for a new error in clang 16 (MacOS):
# https://github.com/blackwinter/unicode/pull/11
unicode = attrs: {
buildFlags = [
"--with-cflags=-Wno-incompatible-function-pointer-types"
];
};
# Workaround: remove rake from nativeBuildInputs, otherwise it causes
# xapian-bindings to build against the default Ruby version
# instead of our chosen version.
Expand Down
7 changes: 7 additions & 0 deletions contrib/nix/ruby2.7-shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ let
})
];
};
# Workaround for a new error in clang 16 (MacOS):
# https://github.com/blackwinter/unicode/pull/11
unicode = attrs: {
buildFlags = [
"--with-cflags=-Wno-incompatible-function-pointer-types"
];
};
};
};
in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }
7 changes: 7 additions & 0 deletions contrib/nix/ruby3.0-shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ let
})
];
};
# Workaround for a new error in clang 16 (MacOS):
# https://github.com/blackwinter/unicode/pull/11
unicode = attrs: {
buildFlags = [
"--with-cflags=-Wno-incompatible-function-pointer-types"
];
};
};
};
in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }
7 changes: 7 additions & 0 deletions contrib/nix/ruby3.1-shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ let
})
];
};
# Workaround for a new error in clang 16 (MacOS):
# https://github.com/blackwinter/unicode/pull/11
unicode = attrs: {
buildFlags = [
"--with-cflags=-Wno-incompatible-function-pointer-types"
];
};
};
};
in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }
7 changes: 7 additions & 0 deletions contrib/nix/ruby3.2-shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ let
})
];
};
# Workaround for a new error in clang 16 (MacOS):
# https://github.com/blackwinter/unicode/pull/11
unicode = attrs: {
buildFlags = [
"--with-cflags=-Wno-incompatible-function-pointer-types"
];
};
};
};
in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }
7 changes: 7 additions & 0 deletions contrib/nix/ruby3.3-shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ let
})
];
};
# Workaround for a new error in clang 16 (MacOS):
# https://github.com/blackwinter/unicode/pull/11
unicode = attrs: {
buildFlags = [
"--with-cflags=-Wno-incompatible-function-pointer-types"
];
};
};
};
in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }

0 comments on commit 3c63d7c

Please sign in to comment.