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

cross: fix mepo to cross compile again

Browse Source
This commit is contained in:
Colin
2023-08-08 00:14:40 +00:00
parent 4c4b0ce920
commit 3a00e93dc3
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
overlays/cross.nix
View File

@@ -852,7 +852,7 @@ in {
}); });
mepo-latest = prev.mepo-latest.overrideAttrs (upstream: { mepo-latest = prev.mepo-latest.overrideAttrs (upstream: {
doCheck = false; dontUseZigCheck = true;
nativeBuildInputs = upstream.nativeBuildInputs ++ [ nativeBuildInputs = upstream.nativeBuildInputs ++ [
# zig hardcodes the /lib/ld-linux.so interpreter which breaks nix dynamic linking & dep tracking # zig hardcodes the /lib/ld-linux.so interpreter which breaks nix dynamic linking & dep tracking
final.autoPatchelfHook final.autoPatchelfHook
@@ -869,18 +869,15 @@ in {
--replace 'step.linkSystemLibrary("curl")' 'step.linkSystemLibrary("libcurl")' \ --replace 'step.linkSystemLibrary("curl")' 'step.linkSystemLibrary("libcurl")' \
--replace 'exe.install();' 'exe.install(); if (true) { return; } // skip tests when cross compiling' --replace 'exe.install();' 'exe.install(); if (true) { return; } // skip tests when cross compiling'
''; '';
# skip the mepo -docman self-documenting invocation
postInstall = ''
install -d $out/share/man/man1
'';
# optional `zig build` debugging flags: # optional `zig build` debugging flags:
# - --verbose # - --verbose
# - --verbose-cimport # - --verbose-cimport
# - --help # - --help
installPhase = '' zigBuildFlags = [ "-Dtarget=aarch64-linux-gnu" ];
runHook preInstall
zig build -Dtarget=aarch64-linux-gnu -Drelease-safe=true -Dcpu=baseline --prefix $out install
install -d $out/share/man/man1
runHook postInstall
'';
}); });
# mepo = emulateBuildMachine (prev.mepo.override { # mepo = emulateBuildMachine (prev.mepo.override {

3
overlays/preferences.nix
View File

@@ -2,6 +2,9 @@
# prefer to encode these in `sane.programs` # prefer to encode these in `sane.programs`
# resort to this method for e.g. system dependencies, or things which are referenced from too many places. # resort to this method for e.g. system dependencies, or things which are referenced from too many places.
(next: prev: { (next: prev: {
# it's an input to e.g. sxmo-utils, so we need to override it here.
mepo = next.mepo-latest;
pipewire = prev.pipewire.override { pipewire = prev.pipewire.override {
# avoid a dep on python3.10-PyQt5, which has mixed qt5 versions. # avoid a dep on python3.10-PyQt5, which has mixed qt5 versions.
# this means we lose firewire support (oh well..?) # this means we lose firewire support (oh well..?)

2
pkgs/default.nix
View File

@@ -28,7 +28,7 @@ let
eg25-manager = callPackage ./additional/eg25-manager { }; eg25-manager = callPackage ./additional/eg25-manager { };
feeds = lib.recurseIntoAttrs (callPackage ./additional/feeds { }); feeds = lib.recurseIntoAttrs (callPackage ./additional/feeds { });
lemoa = callPackage ./additional/lemoa { }; lemoa = callPackage ./additional/lemoa { };
mepo-latest = callPackage ./additional/mepo-latest { }; mepo-latest = callPackage ./additional/mepo-latest { inherit (unpatched) mepo; };
jellyfin-media-player-qt6 = callPackage ./additional/jellyfin-media-player-qt6 { }; jellyfin-media-player-qt6 = callPackage ./additional/jellyfin-media-player-qt6 { };
firefox-extensions = lib.recurseIntoAttrs (callPackage ./additional/firefox-extensions { }); firefox-extensions = lib.recurseIntoAttrs (callPackage ./additional/firefox-extensions { });
gopass-native-messaging-host = callPackage ./additional/gopass-native-messaging-host { }; gopass-native-messaging-host = callPackage ./additional/gopass-native-messaging-host { };