nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

foot: fix cross compilation

Browse Source 
* needs PKG_CONFIG_FOR_BUILD

* in the non-native case we need wayland-scanner (build) and
  wayland-protocols (host) separately

* ar needs targetPrefix as well
This commit is contained in:
sternenseemann 2021-07-08 14:13:30 +02:00 committed by sterni
parent 805e945e82
commit 96054245b5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/terminal-emulators/foot/default.nix
View File

@ -15,6 +15,7 @@
, scdoc , scdoc
, tllist , tllist
, wayland-protocols , wayland-protocols
, wayland-scanner
, pkg-config , pkg-config
, utf8proc , utf8proc
, allowPgo ? true , allowPgo ? true
@ -77,7 +78,7 @@ let
}."${compilerName}"; }."${compilerName}";
# ar with lto support # ar with lto support
ar = { ar = stdenv.cc.bintools.targetPrefix + {
"clang" = "llvm-ar"; "clang" = "llvm-ar";
"gcc" = "gcc-ar"; "gcc" = "gcc-ar";
"unknown" = "ar"; "unknown" = "ar";
@ -97,19 +98,24 @@ stdenv.mkDerivation rec {
sha256 = "0yrz7n0wls8g8w7ja934icwxmng3sxh70x87qmzc9c9cb1wyd989"; sha256 = "0yrz7n0wls8g8w7ja934icwxmng3sxh70x87qmzc9c9cb1wyd989";
}; };
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [ nativeBuildInputs = [
wayland-scanner
meson meson
ninja ninja
ncurses ncurses
scdoc scdoc
tllist
wayland-protocols
pkg-config pkg-config
] ++ lib.optionals (compilerName == "clang") [ ] ++ lib.optionals (compilerName == "clang") [
stdenv.cc.cc.libllvm.out stdenv.cc.cc.libllvm.out
]; ];
buildInputs = [ buildInputs = [
tllist
wayland-protocols
fontconfig fontconfig
freetype freetype
pixman pixman