Loading pkgs/development/compilers/gnu-smalltalk/0000-fix_mkorder.patch 0 → 100644 +21 −0 Original line number Diff line number Diff line --- 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 == "") pkgs/development/compilers/gnu-smalltalk/default.nix +6 −0 Original line number Diff line number Diff line Loading @@ -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 ]; Loading Loading
pkgs/development/compilers/gnu-smalltalk/0000-fix_mkorder.patch 0 → 100644 +21 −0 Original line number Diff line number Diff line --- 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 == "")
pkgs/development/compilers/gnu-smalltalk/default.nix +6 −0 Original line number Diff line number Diff line Loading @@ -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 ]; Loading