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

get conky to cross compile

Browse Source
This commit is contained in:
Colin 2023-05-18 11:07:36 +00:00
parent ec77cdaa49
commit 54c7d00621
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hosts/common/cross/default.nix
View File

@ -403,6 +403,7 @@ in
# packages which don't cross compile
inherit (emulated)
# adwaita-qt6 # although qtbase cross-compiles with minor change, qtModule's qtbase can't
# conky # needs to be able to build lua
# duplicity # python3.10-s3transfer
# gdk-pixbuf # cross-compiled version doesn't output bin/gdk-pixbuf-thumbnailer (used by webp-pixbuf-loader
# gnome-tour
@ -551,6 +552,30 @@ in
];
});
# conky = (prev.conky.override {
# curlSupport = prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform;
# # docbook2x dependency doesn't cross compile
# docsSupport = prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform;
# journalSupport = prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform;
# # tries to invoke `toluapp`, which would likely compile to wrong platform?
# luaSupport = prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform;
# ncursesSupport = prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform;
# wirelessSupport = prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform;
# x11Support = prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform;
# # lua = emulated.lua5_3_compat;
# }
# ).overrideAttrs (upstream: {
# nativeBuildInputs = upstream.nativeBuildInputs ++ [ next.git ];
# buildInputs = [ next.lua5_4_compat ];
# cmakeFlags = upstream.cmakeFlags ++ ["-DLUA_INCLUDE_DIR=/tmp/"];
# });
conky = ((useEmulatedStdenv prev.conky).override {
# docbook2x dependency doesn't cross compile
docsSupport = prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform;
}).overrideAttrs (upstream: {
nativeBuildInputs = upstream.nativeBuildInputs ++ [ next.git ];
});
dante = prev.dante.override {
# fixes: "configure: error: error: getaddrinfo() error value count too low"
inherit (emulated) stdenv;

6
nixpatches/list.nix
View File

@ -134,6 +134,12 @@ in [
# sha256 = "sha256-UWnfS+stVpUZ3Sfaym9XtVBlwvHWJVMaW7cYIcf3M5Q=";
# })
(fetchpatch' {
# 2023-02-18: conky: 1.13.1 -> 1.18.0
prUrl = "https://github.com/NixOS/nixpkgs/pull/217224";
hash = "sha256-+g3XhmBt/udhbBDiVyfWnfXKvZTvDurlvPblQ9HYp3s=";
})
# Fix mk flutter app
# closed (not merged). updates fluffychat 1.2.0 -> 1.6.1, but unstable hashing