Compare commits

...

3 Commits

Author SHA1 Message Date
Colin c5e913fbe0 waybar: support cross compilation 2024-04-24 13:20:55 +00:00
Colin f092378031 hyprland: support cross-compilation 2024-04-24 13:20:55 +00:00
Colin b1e9283dd5 wlroots_0_17: fix cross compilation 2024-04-24 13:20:55 +00:00
3 changed files with 15 additions and 7 deletions

View File

@ -78,6 +78,11 @@ stdenv.mkDerivation (finalAttrs: {
--replace "@DIRTY@" "" --replace "@DIRTY@" ""
''; '';
depsBuildBuild = [
# to find wayland-scanner when cross-compiling
pkg-config
];
nativeBuildInputs = [ nativeBuildInputs = [
jq jq
makeWrapper makeWrapper

View File

@ -40,10 +40,12 @@
, udev , udev
, upower , upower
, wayland , wayland
, wayland-scanner
, wireplumber , wireplumber
, wrapGAppsHook , wrapGAppsHook
, cavaSupport ? true , cavaSupport ? true
, enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
, evdevSupport ? true , evdevSupport ? true
, experimentalPatches ? true , experimentalPatches ? true
, hyprlandSupport ? true , hyprlandSupport ? true
@ -55,7 +57,7 @@
, pipewireSupport ? true , pipewireSupport ? true
, pulseSupport ? true , pulseSupport ? true
, rfkillSupport ? true , rfkillSupport ? true
, runTests ? true , runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
, sndioSupport ? true , sndioSupport ? true
, swaySupport ? true , swaySupport ? true
, traySupport ? true , traySupport ? true
@ -97,9 +99,10 @@ stdenv.mkDerivation (finalAttrs: {
meson meson
ninja ninja
pkg-config pkg-config
scdoc wayland-scanner
wrapGAppsHook wrapGAppsHook
] ++ lib.optional withMediaPlayer gobject-introspection; ] ++ lib.optional withMediaPlayer gobject-introspection
++ lib.optional enableManpages scdoc;
propagatedBuildInputs = lib.optionals withMediaPlayer [ propagatedBuildInputs = lib.optionals withMediaPlayer [
glib glib
@ -107,8 +110,6 @@ stdenv.mkDerivation (finalAttrs: {
python3.pkgs.pygobject3 python3.pkgs.pygobject3
]; ];
strictDeps = false;
buildInputs = [ buildInputs = [
gtk-layer-shell gtk-layer-shell
gtkmm3 gtkmm3
@ -154,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
"libinput" = inputSupport; "libinput" = inputSupport;
"libnl" = nlSupport; "libnl" = nlSupport;
"libudev" = udevSupport; "libudev" = udevSupport;
"man-pages" = true; "man-pages" = enableManpages;
"mpd" = mpdSupport; "mpd" = mpdSupport;
"mpris" = mprisSupport; "mpris" = mprisSupport;
"pipewire" = pipewireSupport; "pipewire" = pipewireSupport;

View File

@ -127,9 +127,11 @@ rec {
wlroots_0_17 = generic { wlroots_0_17 = generic {
version = "0.17.2"; version = "0.17.2";
hash = "sha256-Of9qykyVnBURc5A2pvCMm7sLbnuuG7OPWLxodQLN2Xg="; hash = "sha256-Of9qykyVnBURc5A2pvCMm7sLbnuuG7OPWLxodQLN2Xg=";
extraNativeBuildInputs = [
hwdata
];
extraBuildInputs = [ extraBuildInputs = [
ffmpeg ffmpeg
hwdata
libliftoff libliftoff
libdisplay-info libdisplay-info
]; ];