Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gnu-smalltalk: fix build #314810

Merged
merged 2 commits into from
May 26, 2024
Merged

gnu-smalltalk: fix build #314810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
577e785
gnu-smalltalk: fix-build
GiulioCocconi May 26, 2024
7619c96
gnu-smalltalk: Numbered the patch
GiulioCocconi May 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions pkgs/development/compilers/gnu-smalltalk/0000-fix_mkorder.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--- a/packages/gtk/mkorder.awk
+++ b/packages/gtk/mkorder.awk
@@ -33,6 +33,9 @@
paths[1] = "."
n_paths = 1
n_prefixes = split(_prefixes, prefixes)
+
+ ignored_files = [ "glib/gwin32.h" ]
+
split(_libs, libs)
split(_files, files)
for (i = 1; (i in libs); i++)
@@ -60,7 +63,7 @@

function process_file(name, file) {
file = find_file(name)
- if (file in processed)
+ if ((name in ignored_files) or (file in processed))
return
processed[file] = 1
if (file == "")
6 changes: 6 additions & 0 deletions pkgs/development/compilers/gnu-smalltalk/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ in stdenv.mkDerivation rec {
sha256 = "1k2ssrapfzhngc7bg1zrnd9n2vyxp9c9m70byvsma6wapbvib6l1";
};

patches = [
# The awk script incorrectly parsed `glib/glib.h` and was trying to find `glib/gwin32.h`,
# that isn't included since we're building only for linux.
./0000-fix_mkorder.patch
];

# The dependencies and their justification are explained at
# http://smalltalk.gnu.org/download
nativeBuildInputs = [ pkg-config ];
Expand Down