Overlay wide: fix packages breaking on buildDocs = false

7 files changed, 10 insertions, 11 deletions

diff --git a/pkgs/gebaar-libinput/.#default.nix b/pkgs/gebaar-libinput/.#default.nix
new file mode 120000
index 0000000..4030f49
--- /dev/null
+++ b/pkgs/gebaar-libinput/.#default.nix
@@ -0,0 +1 @@
+alex@Alex_Nixos.1275:1556573276
\ No newline at end of file
diff --git a/pkgs/mako/default.nix b/pkgs/mako/default.nix
index 1233e8f..58e6c1a 100644
--- a/pkgs/mako/default.nix
+++ b/pkgs/mako/default.nix
@@ -19,9 +19,10 @@ stdenv.mkDerivation rec {
     sha256 = metadata.sha256;
   };
 
-  nativeBuildInputs = [ pkgconfig meson ninja ] ++ stdenv.lib.optional buildDocs [ scdoc ];
+  nativeBuildInputs = [ pkgconfig meson ninja ] ++ stdenv.lib.optional buildDocs scdoc;
   buildInputs = [ gtk3 cairo pango systemd wayland wayland-protocols ];
-  mesonFlags = [ "-Dauto_features=enabled" ];
+  mesonFlags = [ "-Dauto_features=enabled" ]
+    ++ stdenv.lib.optional (!buildDocs) "-Dman-pages=disabled";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/oguri/default.nix b/pkgs/oguri/default.nix
index b0d1bb7..d36bde2 100644
--- a/pkgs/oguri/default.nix
+++ b/pkgs/oguri/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub
 , meson, ninja, pkgconfig
 , cairo, gtk3, wayland, wayland-protocols
-, scdoc, buildDocs ? true
 }:
 
 let
@@ -18,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = metadata.sha256;
   };
 
-  nativeBuildInputs = [ pkgconfig meson ninja ] ++ stdenv.lib.optional buildDocs [ scdoc ];
+  nativeBuildInputs = [ pkgconfig meson ninja ];
   buildInputs = [ cairo gtk3 wayland wayland-protocols ];
   mesonFlags = [ "-Dauto_features=enabled" ];
 
diff --git a/pkgs/redshift-wayland/default.nix b/pkgs/redshift-wayland/default.nix
index 992e460..e1f1778 100644
--- a/pkgs/redshift-wayland/default.nix
+++ b/pkgs/redshift-wayland/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional  withRandr        libxcb
     ++ stdenv.lib.optional  withGeoclue      geoclue
     ++ stdenv.lib.optional  withDrm          libdrm
-    ++ stdenv.lib.optional  withWayland      [ wayland wayland-protocols wlroots ]
+    ++ stdenv.lib.optionals withWayland      [ wayland wayland-protocols wlroots ]
     ;
 
   pythonPath = [ pygobject3 pyxdg ];
diff --git a/pkgs/slurp/default.nix b/pkgs/slurp/default.nix
index 3a67c70..ea85243 100644
--- a/pkgs/slurp/default.nix
+++ b/pkgs/slurp/default.nix
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
     sha256 = metadata.sha256;
   };
 
-  nativeBuildInputs = [ pkgconfig meson ninja ] ++ stdenv.lib.optional buildDocs [ scdoc ];
+  nativeBuildInputs = [ pkgconfig meson ninja ] ++ stdenv.lib.optional buildDocs scdoc;
   buildInputs = [
     cairo wayland wayland-protocols
   ];
   mesonFlags = [
     "-Dauto_features=enabled"
-  ];
+  ] ++ stdenv.lib.optional (!buildDocs) "-Dman-pages=disabled";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/swayidle/default.nix b/pkgs/swayidle/default.nix
index a6d54bc..e027266 100644
--- a/pkgs/swayidle/default.nix
+++ b/pkgs/swayidle/default.nix
@@ -31,10 +31,9 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dman-pages=enabled"
     "-Dlogind=enabled"
     "-Dlogind-provider=systemd"
-  ];
+  ] ++ stdenv.lib.optional buildDocs "-Dman-pages=enabled";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/swaylock/default.nix b/pkgs/swaylock/default.nix
index c293600..905a7dc 100644
--- a/pkgs/swaylock/default.nix
+++ b/pkgs/swaylock/default.nix
@@ -34,8 +34,7 @@ stdenv.mkDerivation rec {
     "-Dswaylock-version=${version}"
     "-Dpam=enabled"
     "-Dgdk-pixbuf=enabled"
-    "-Dman-pages=enabled"
-  ];
+  ] ++ stdenv.lib.optional buildDocs "-Dman-pages=enabled";
 
   enableParallelBuilding = true;