colin
/
nix-files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cross: gnustep: emulate only `gnustep.base`

This commit is contained in:
Colin 2023-07-18 01:32:50 +00:00
parent 13d3a5ba6b
commit 1dfd894568
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixpatches/list.nix
View File

@ -215,6 +215,12 @@ in [
hash = "sha256-lXuLHdSPhWol9X5QX4cxnZqoVGUWEQTCZLmosvLX+WY=";
})
(fetchpatch' {
title = "gnustep: remove `rec` to support `overrideScope`";
saneCommit = "69162cbf727264e50fc9d7222a03789d12644705";
hash = "sha256-rD0es4uUbaLMrI9ZB2HzPmRLyu/ixNBLAFyDJtFHNko=";
})
# (fetchpatch' {
# # N.B.: compiles, but runtime error on launch suggestive of some module not being shipped
# title = "matrix-appservice-irc: 0.38.0 -> 1.0.0";

14
overlays/cross.nix
View File

@ -72,10 +72,6 @@ in {
# duplicity # python3.10-s3transfer
# gdk-pixbuf # cross-compiled version doesn't output bin/gdk-pixbuf-thumbnailer (used by webp-pixbuf-loader
# gnome-tour
# XXX: gnustep members aren't individually overridable, because the "scope" uses `rec` such that members don't see overrides
# gnustep is going to need a *lot* of work/domain-specific knowledge to truly cross-compile,
# though if we make the members overridable maybe we can get away with emulating only stdenv.
gnustep # gnustep.base: "configure: error: Your compiler does not appear to implement the -fconstant-string-class option needed for support of strings."
# grpc
hare
harec
@ -352,6 +348,16 @@ in {
# fixes -msse2, -mfpmath=sse flags
wrapGAppsHook4 = final.wrapGAppsHook;
};
gnustep = prev.gnustep.overrideScope' (self: super: {
# "configure: error: Your compiler does not appear to implement the -fconstant-string-class option needed for support of strings."
# gnustep is going to need a *lot* of work/domain-specific knowledge to truly cross-compile,
base = emulated.gnustep.base;
# base = super.base.override {
# # emulating gsmake amounts to emulating stdenv.
# # still fails, but with "checking FFI library usage... ./configure: line 11028: pkg-config: command not found"
# inherit (emulated.gnustep) gsmakeDerivation;
# };
});
gthumb = mvInputs { nativeBuildInputs = [ final.glib ]; } prev.gthumb;
gnome = prev.gnome.overrideScope' (self: super: {