ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 20:49:52 +03:00
Code Issues Projects Releases Wiki Activity

gnome-tour: work towards fixing cross

Browse Source 
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.
```
This commit is contained in:
Artturin 2022-08-07 01:45:53 +03:00
parent 24723644ac
commit a32cd711ef
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/desktops/gnome/core/gnome-tour/default.nix
View File

@ -17,6 +17,8 @@
, libadwaita
, librsvg
, rustc
, rust
, writeText
, cargo
}:
@ -31,6 +33,10 @@ stdenv.mkDerivation rec {
cargoVendorDir = "vendor";
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
appstream-glib
cargo
@ -54,6 +60,16 @@ stdenv.mkDerivation rec {
librsvg
];
mesonFlags =
let
# ERROR: 'rust' compiler binary not defined in cross or native file
crossFile = writeText "cross-file.conf" ''
[binaries]
rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ]
'';
in
lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;