Skip to content

Commit

Permalink
Merge pull request #314810 from GiulioCocconi/fix/smalltalk
Browse files Browse the repository at this point in the history
gnu-smalltalk: fix build
  • Loading branch information
risicle committed May 26, 2024
2 parents cec5c3b + 7619c96 commit b337f61
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
21 changes: 21 additions & 0 deletions pkgs/development/compilers/gnu-smalltalk/0000-fix_mkorder.patch
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
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

0 comments on commit b337f61

Please sign in to comment.