Compare commits

..

No commits in common. "c5e913fbe066995c08dedde91c88358b6189d9d0" and "db9627d93457466eef038192e36cb3748e799b36" have entirely different histories.

3 changed files with 7 additions and 15 deletions

View File

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

View File

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

View File

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