lots of cross fixes #189397

Artturin · 2022-09-02T02:36:29Z

Description of changes

Things done

Mindavi · 2022-09-02T05:43:01Z

pkgs/development/libraries/cogl/default.nix

@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
  ] ++ lib.optional gstreamerSupport "--enable-cogl-gst"
  ++ lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];

+  # TODO: this shouldn't propagate so many things
+  # especially not gobject-introspection


cc @lovek323

Mindavi · 2022-09-02T05:44:24Z

pkgs/development/libraries/graphene/default.nix

    "-Dinstalled_test_datadir=${placeholder "installedTests"}/share"
    "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec"
  ];

  doCheck = true;

  postPatch = ''
+    substituteInPlace tests/meson.build \


Sounds very hacky :)

wonder why i did that instead of just making the installedTests conditional on host == build
changed it to that

pkgs/os-specific/linux/power-profiles-daemon/default.nix

Mindavi · 2022-09-02T05:52:41Z

Thanks! Currently diff LGTM, but indeed some things should go upstream sooner rather than later. Do you want to track that somewhere or would the source of nixpkgs be enough to remember?

Sprinkled some small comments, nothing major.

doesn't work yet ``` gnome-tour-aarch64-unknown-linux-gnu> error: linking with `/nix/store/3d9zjv5vaqjxb9kwbdqsd194alwm97x1-gcc-wrapper-11.3.0/bin/cc` failed: exit status: 1 gnome-tour-aarch64-unknown-linux-gnu> | gnome-tour-aarch64-unknown-linux-gnu> = note: "/nix/store/3d9zjv5vaqjxb9kwbdqsd194alwm97x1-gcc-wrapper-11.3.0/bin/cc" "-m64" "/build/rustcd8pO0A/symbols.o" "/build/gnome-tour-42.0/build/src/release/deps/gnome_to ... gnome-tour-aarch64-unknown-linux-gnu> /nix/store/vhf2cr6immz4qdxd83y025fnxim8mmfg-binutils-2.38/bin/ld: skipping incompatible /nix/store/c84gzzifyh10w9m612wxcas04r7fq4h0-glib-aarch64-unknown-linux-gnu-2. 72.3/lib/libglib-2.0.so when searching for -lglib-2.0 gnome-tour-aarch64-unknown-linux-gnu> /nix/store/vhf2cr6immz4qdxd83y025fnxim8mmfg-binutils-2.38/bin/ld: cannot find -lglib-2.0: No such file or directory ... gnome-tour-aarch64-unknown-linux-gnu> collect2: error: ld returned 1 exit status ... gnome-tour-aarch64-unknown-linux-gnu> FAILED: src/gnome-tour gnome-tour-aarch64-unknown-linux-gnu> /nix/store/m5n32vy7rbfrqcxigw1p6wyx3cj7smg9-coreutils-9.1/bin/env CARGO_HOME=/build/gnome-tour-42.0/build/cargo-home /nix/store/76l9r44x1sv323c90j6vi401n4fvims2-cargo-1.62.1/b in/cargo build --manifest-path /build/gnome-tour-42.0/Cargo.toml --target-dir /build/gnome-tour-42.0/build/src --release && cp src/release/gnome-tour src/gnome-tour gnome-tour-aarch64-unknown-linux-gnu> ninja: build stopped: subcommand failed. ```

jtojnar · 2022-09-02T16:43:58Z

pkgs/desktops/gnome/apps/gnome-logs/default.nix

  ];

  buildInputs = [
-    glib


Should be here as well, do not rely on propagation: https://gitlab.gnome.org/GNOME/gnome-logs/-/blob/e0a8ab855f4ea318f2d2c5dfb1b314ac2702c987/meson.build#L64

jtojnar · 2022-09-02T16:47:00Z

pkgs/desktops/gnome/apps/gnome-logs/default.nix

+    # for some reason upstream does the following instead of using meson builtins
+    # TODO: tell upstream to use meson builtins / remove the duplicate check
+
+    # dependency('pkg-config', version : '>= 0.24')


Likely a remnant from porting from autotools: https://gitlab.gnome.org/GNOME/gnome-logs/-/blame/e0a8ab855f4ea318f2d2c5dfb1b314ac2702c987/meson.build#L56

https://gitlab.gnome.org/GNOME/gnome-logs/-/merge_requests/47

The extraneous mkenums check was removed in https://gitlab.gnome.org/GNOME/gnome-logs/-/merge_requests/37

pulled both in patches

jtojnar · 2022-09-02T16:49:55Z

pkgs/desktops/gnome/apps/gnome-characters/default.nix

@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
    python3
    desktop-file-utils
    wrapGAppsHook4
+    gjs


This should be fixed by adding native: true kwarg to find_program here:

https://gitlab.gnome.org/GNOME/gnome-characters/-/blob/b72bf4e1a7cbe8446ef2659d432b78ac8b50df83/src/meson.build#L2

Edit: that might not work looking at https://mesonbuild.com/Reference-manual_functions.html#find_program but it is definitely a native build input.

find_program already looks in PATH

ther reason its needed in buildInputs is https://gitlab.gnome.org/GNOME/gnome-characters/-/blob/b72bf4e1a7cbe8446ef2659d432b78ac8b50df83/meson.build#L47

buildInputs I am fine with since gjs is an interpreter used for running the app. But it should not be necessary at build time, as far as I can tell.

https://gitlab.gnome.org/GNOME/gnome-characters/-/merge_requests/82

and applied

jtojnar · 2022-09-02T16:53:40Z

pkgs/desktops/gnome/apps/gnome-clocks/default.nix

+    # error: Package `...' not found in specified Vala API directories or GObject-Introspection GIR directories
+    # TODO: the vala setuphook should look for vala filess in targetOffset instead of hostOffset
+    gsound


Then it should be fixed there.

yeah im going to do it in a separate pr

pkgs/desktops/gnome/apps/seahorse/default.nix

pkgs/development/libraries/gtkmm/3.x.nix

jtojnar · 2022-09-02T17:03:08Z

pkgs/development/libraries/libgnomekbd/default.nix

@@ -25,6 +27,11 @@ stdenv.mkDerivation rec {
    glib
  ];

+  postPatch = ''


We are switching to meson in #182618, we can probably cherry-pick that to master.

pkgs/development/python-modules/gst-python/default.nix

teto · 2022-09-03T10:32:35Z

I won't/can't comment on the technical side but @Artturin I wonder what's your motivation for all these cross-building fixes ? It is great, just curious :)

Artturin · 2022-09-07T17:20:45Z

I won't/can't comment on the technical side but @Artturin I wonder what's your motivation for all these cross-building fixes ? It is great, just curious :)

I want to see how much of nixpkgs we can get to cross-compile

they weren't being built before at all

no idea why this still happens here when this issue was fixed in gobject-introspection hook and the fix works for other packages

this is in response to an old TODO: <NixOS#189397 (comment)>

gtk4: fix cross

237da4a

github-actions bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: python labels Sep 2, 2022

Artturin changed the title ~~fix lot of cross builds~~ lots of cross fixes Sep 2, 2022

Artturin added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Sep 2, 2022

ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels Sep 2, 2022

Mindavi reviewed Sep 2, 2022

View reviewed changes

pkgs/os-specific/linux/power-profiles-daemon/default.nix Show resolved Hide resolved

Artturin force-pushed the gobjectfunfixessplit branch 2 times, most recently from ced75a7 to a57e5de Compare September 2, 2022 13:13

Artturin added 2 commits September 2, 2022 16:25

graphene: build gir when cross

322e4d8

gsettings-desktop-schemas: build gir when cross

2472364

Artturin force-pushed the gobjectfunfixessplit branch 2 times, most recently from 41e0af9 to f813b1f Compare September 2, 2022 15:30

Artturin force-pushed the gobjectfunfixessplit branch from f813b1f to 15cd209 Compare September 2, 2022 15:32

Artturin marked this pull request as ready for review September 2, 2022 16:00

Artturin requested review from jtojnar, FRidh and jonringer as code owners September 2, 2022 16:00

jtojnar reviewed Sep 2, 2022

View reviewed changes

pkgs/desktops/gnome/apps/seahorse/default.nix Show resolved Hide resolved

jtojnar reviewed Sep 2, 2022

View reviewed changes

pkgs/development/libraries/gtkmm/3.x.nix Outdated Show resolved Hide resolved

jtojnar reviewed Sep 2, 2022

View reviewed changes

pkgs/development/python-modules/gst-python/default.nix Outdated Show resolved Hide resolved

Artturin force-pushed the gobjectfunfixessplit branch 6 times, most recently from 2c9bff3 to 470e9ba Compare September 2, 2022 19:35

Artturin added 3 commits September 7, 2022 21:20

treewide: cross fixes

da9a9a4

libgnomekbd: fix cross and build introspection data

a52d95a

they weren't being built before at all

uhttpmock: fix cross

b59f013

no idea why this still happens here when this issue was fixed in gobject-introspection hook and the fix works for other packages

Artturin force-pushed the gobjectfunfixessplit branch from 470e9ba to b59f013 Compare September 7, 2022 18:21

Artturin merged commit 5fcc288 into NixOS:staging Sep 8, 2022

Artturin deleted the gobjectfunfixessplit branch September 8, 2022 20:54

Artturin mentioned this pull request Nov 14, 2023

libgnome-games-support: support cross compilation #267373

Merged

13 tasks

uninsane added a commit to uninsane/nixpkgs that referenced this pull request Nov 22, 2023

vala: search for vapi files in targetOffset, not hostOffset

6990fa8

this is in response to an old TODO: <NixOS#189397 (comment)>

uninsane mentioned this pull request Nov 22, 2023

vala: search for vapi files in targetOffset, not hostOffset #269171

Closed

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

lots of cross fixes #189397

lots of cross fixes #189397

Artturin commented Sep 2, 2022

Mindavi Sep 2, 2022

Mindavi Sep 2, 2022

Artturin Sep 2, 2022 •

edited

Loading

Mindavi commented Sep 2, 2022

jtojnar Sep 2, 2022

jtojnar Sep 2, 2022

Artturin Sep 2, 2022

jtojnar Sep 2, 2022

Artturin Sep 2, 2022

jtojnar Sep 2, 2022 •

edited

Loading

Artturin Sep 2, 2022

jtojnar Sep 2, 2022

Artturin Sep 2, 2022 •

edited

Loading

jtojnar Sep 2, 2022

Artturin Sep 2, 2022

Artturin Nov 15, 2023

jtojnar Sep 2, 2022 •

edited

Loading

teto commented Sep 3, 2022

Artturin commented Sep 7, 2022

lots of cross fixes #189397

lots of cross fixes #189397

Conversation

Artturin commented Sep 2, 2022

Description of changes

Things done

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Artturin Sep 2, 2022 • edited Loading

Choose a reason for hiding this comment

Mindavi commented Sep 2, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jtojnar Sep 2, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Artturin Sep 2, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jtojnar Sep 2, 2022 • edited Loading

Choose a reason for hiding this comment

teto commented Sep 3, 2022

Artturin commented Sep 7, 2022

Artturin Sep 2, 2022 •

edited

Loading

jtojnar Sep 2, 2022 •

edited

Loading

Artturin Sep 2, 2022 •

edited

Loading

jtojnar Sep 2, 2022 •

edited

Loading