pkgs/tools/wayland: enable strictDeps

2022-05-09 17:18:15 +03:00 · 2022-05-09 17:18:15 +03:00 · 947bc96c2d
commit 947bc96c2d
parent fd0740f474
19 changed files with 57 additions and 15 deletions
--- a/pkgs/tools/wayland/kanshi/default.nix
+++ b/pkgs/tools/wayland/kanshi/default.nix
@ -6,6 +6,7 @@
 , pkg-config
 , scdoc
 , wayland
+, wayland-scanner
 }:

 stdenv.mkDerivation rec {
@ -19,7 +20,11 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-RVMeS2qEjTYK6r7IwMeFSqfRpKR8di2eQXhewfhTnYI=";
  };

-  nativeBuildInputs = [ meson ninja pkg-config scdoc ];
+  strictDeps = true;
+  depsBuildBuild = [
+    pkg-config
+  ];
+  nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
  buildInputs = [ wayland ];

  meta = with lib; {
--- a/pkgs/tools/wayland/oguri/default.nix
+++ b/pkgs/tools/wayland/oguri/default.nix
@ -8,6 +8,7 @@
 , gdk-pixbuf
 , wayland
 , wayland-protocols
+, wayland-scanner
 }:

 stdenv.mkDerivation rec {
@ -21,7 +22,8 @@ stdenv.mkDerivation rec {
    sha256 = "sXNvpI/YPDPd2cXQAfRO4ut21gSCXxbo1DpaZmHJDYQ=";
  };

-  nativeBuildInputs = [ pkg-config meson ninja ];
+  strictDeps = true;
+  nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ];
  buildInputs = [
    cairo
    gdk-pixbuf
--- a/pkgs/tools/wayland/slurp/default.nix
+++ b/pkgs/tools/wayland/slurp/default.nix
@ -8,6 +8,7 @@
 , libxkbcommon
 , wayland
 , wayland-protocols
+, wayland-scanner
 , buildDocs ? true, scdoc
 }:

@ -22,10 +23,12 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-5ZB34rqLyZmfjT/clxNRDmF0qgITFZ5xt/gIEXQzvQE=";
  };

+  strictDeps = true;
  nativeBuildInputs = [
    meson
    ninja
    pkg-config
+    wayland-scanner
  ] ++ lib.optional buildDocs scdoc;

  buildInputs = [
--- a/pkgs/tools/wayland/swaykbdd/default.nix
+++ b/pkgs/tools/wayland/swaykbdd/default.nix
@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-umYPVkkYeu6TyVkjDsVBsRZLYh8WyseCPdih85kTz6A=";
  };

+  strictDeps = true;
  nativeBuildInputs = [ meson ninja pkg-config ];
  buildInputs = [ json_c ];

--- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
+++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
@ -1,7 +1,6 @@
 { lib
 , fetchFromGitHub
 , ocamlPackages
-, buildPackages
 }:

 ocamlPackages.buildDunePackage rec {
@ -23,8 +22,9 @@ ocamlPackages.buildDunePackage rec {
  useDune2 = true;
  minimumOCamlVersion = "4.08";

+  strictDeps = true;
  nativeBuildInputs = [
-    buildPackages.ocamlPackages.ppx_cstruct
+    ocamlPackages.ppx_cstruct
  ];

  buildInputs = with ocamlPackages; [
@ -32,6 +32,7 @@ ocamlPackages.buildDunePackage rec {
    cmdliner
    logs
    cstruct-lwt
+    ppx_cstruct
  ];

  doCheck = true;
--- a/pkgs/tools/wayland/wayland-utils/default.nix
+++ b/pkgs/tools/wayland/wayland-utils/default.nix
@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
    sha256 = "1h38l850ww6hxjb1l8iwa33nkbz8q88bw6lh0aryjyp8b16crzk4";
  };

+  strictDeps = true;
  depsBuildBuild = [ pkg-config ];
  nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ];
  buildInputs = [ wayland wayland-protocols ];
--- a/pkgs/tools/wayland/wev/default.nix
+++ b/pkgs/tools/wayland/wev/default.nix
@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
    sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms";
  };

+  # for scdoc
+  depsBuildBuild = [
+    pkg-config
+  ];
  nativeBuildInputs = [ pkg-config scdoc wayland-scanner ];
  buildInputs = [ wayland wayland-protocols libxkbcommon ];

--- a/pkgs/tools/wayland/wl-clipboard-x11/default.nix
+++ b/pkgs/tools/wayland/wl-clipboard-x11/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, wl-clipboard }:
+{ lib, stdenv, fetchFromGitHub, wl-clipboard, bash }:

 stdenv.mkDerivation rec {
  pname = "wl-clipboard-x11";
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
    hash = "sha256-i+oF1Mu72O5WPTWzqsvo4l2CERWWp4Jq/U0DffPZ8vg=";
  };

+  strictDeps = true;
+  buildInputs = [ bash ];
  makeFlags = [ "PREFIX=${placeholder "out"}" ];

  postPatch = ''
--- a/pkgs/tools/wayland/wl-clipboard/default.nix
+++ b/pkgs/tools/wayland/wl-clipboard/default.nix
@ -6,6 +6,7 @@
 , pkg-config
 , wayland
 , wayland-protocols
+, wayland-scanner
 }:

 stdenv.mkDerivation rec {
@ -19,8 +20,9 @@ stdenv.mkDerivation rec {
    sha256 = "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d";
  };

-  nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ];
-  buildInputs = [ wayland ];
+  strictDeps = true;
+  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
+  buildInputs = [ wayland wayland-protocols ];

  meta = with lib; {
    homepage = "https://github.com/bugaevc/wl-clipboard";
@ -30,4 +32,3 @@ stdenv.mkDerivation rec {
    platforms = platforms.linux;
  };
 }
-# TODO: is wayland-protocols a nativeBuildInput or a buildInput?
--- a/pkgs/tools/wayland/wl-color-picker/default.nix
+++ b/pkgs/tools/wayland/wl-color-picker/default.nix
@ -7,6 +7,7 @@
 , wl-clipboard
 , imagemagick
 , makeWrapper
+, bash
 }:

 stdenv.mkDerivation rec {
@ -20,7 +21,9 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-lvhpXy4Sd1boYNGhbPoZTJlBhlW5obltDOrEzB1Gq0A=";
  };

+  strictDeps = true;
  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ bash ];

  patchPhase = ''
    substituteInPlace Makefile \
--- a/pkgs/tools/wayland/wl-gammactl/default.nix
+++ b/pkgs/tools/wayland/wl-gammactl/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub
 , meson, pkg-config, ninja
-, wayland, wayland-scanner, wlroots, wlr-protocols, gtk3
+, wayland, wayland-scanner, wlroots, wlr-protocols, gtk3, glib
 }:

 stdenv.mkDerivation rec {
@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
    sha256 = "8iMJK4O/sNIGPOBZQEfK47K6OjT6sxYFe19O2r/VSr8=";
  };

-  nativeBuildInputs = [ meson pkg-config ninja ];
+  strictDeps = true;
+  nativeBuildInputs = [ meson pkg-config ninja glib wayland-scanner ];
  buildInputs = [ wayland wlroots gtk3 ];

  postUnpack = ''
--- a/pkgs/tools/wayland/wl-mirror/default.nix
+++ b/pkgs/tools/wayland/wl-mirror/default.nix
@ -8,6 +8,7 @@
 , wayland-scanner
 , wlr-protocols
 , libGL
+, bash
 , installExampleScripts ? true
 , makeWrapper
 , pipectl
@ -35,6 +36,10 @@ stdenv.mkDerivation rec {
    hash = "sha256-D5uUKaepcSW9v2x6uBeLGXAyuLorlt4Lb6lZD/prfp8=";
  };

+  strictDeps = true;
+  nativeBuildInputs = [ cmake pkg-config wayland-scanner makeWrapper ];
+  buildInputs = [ libGL wayland wayland-protocols wlr-protocols bash ];
+
  postPatch = ''
    echo 'v${version}' > version.txt
    substituteInPlace CMakeLists.txt \
@ -50,9 +55,6 @@ stdenv.mkDerivation rec {
    wrapProgram $out/bin/wl-present --prefix PATH ":" ${wl-present-binpath}
  '';

-  nativeBuildInputs = [ cmake pkg-config wayland-scanner makeWrapper ];
-  buildInputs = [ libGL wayland wayland-protocols wlr-protocols ];
-
  meta = with lib; {
    homepage = "https://github.com/Ferdi265/wl-mirror";
    description = "Mirrors an output onto a Wayland surface.";
--- a/pkgs/tools/wayland/wlr-randr/default.nix
+++ b/pkgs/tools/wayland/wlr-randr/default.nix
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ=";
  };

+  strictDeps = true;
  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
  buildInputs = [ wayland ];

--- a/pkgs/tools/wayland/wlrctl/default.nix
+++ b/pkgs/tools/wayland/wlrctl/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, scdoc, ninja, libxkbcommon, wayland }:
+{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, scdoc, ninja, libxkbcommon, wayland, wayland-scanner }:

 stdenv.mkDerivation rec {
  pname = "wlrctl";
@ -11,7 +11,11 @@ stdenv.mkDerivation rec {
    sha256 = "039cxc82k7x473n6d65jray90rj35qmfdmr390zy0c7ic7vn4b78";
  };

-  nativeBuildInputs = [ meson pkg-config scdoc ninja ];
+  strictDeps = true;
+  depsBuildBuild = [
+    pkg-config
+  ];
+  nativeBuildInputs = [ meson pkg-config scdoc ninja wayland-scanner ];
  buildInputs = [ libxkbcommon wayland ];

  NIX_CFLAGS_COMPILE = "-Wno-error=type-limits";
--- a/pkgs/tools/wayland/wlsunset/default.nix
+++ b/pkgs/tools/wayland/wlsunset/default.nix
@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
    sha256 = "0hhsddh3rs066rbsjksr8kcwg8lvglbvs67dq0r5wx5c1xcwb51w";
  };

+  strictDeps = true;
+  depsBuildBuild = [
+    pkg-config
+  ];
  nativeBuildInputs = [ meson pkg-config ninja wayland-scanner scdoc ];
  buildInputs = [ wayland wayland-protocols ];

--- a/pkgs/tools/wayland/wob/default.nix
+++ b/pkgs/tools/wayland/wob/default.nix
@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-CXRBNnnhNV5LBIasVtmGrRG4ZXFGC7qNInU7Y0QsHbs=";
  };

+  strictDeps = true;
+  depsBuildBuild = [
+    pkg-config
+  ];
  nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
  buildInputs = [ wayland wayland-protocols ]
    ++ lib.optional stdenv.isLinux libseccomp;
--- a/pkgs/tools/wayland/wshowkeys/default.nix
+++ b/pkgs/tools/wayland/wshowkeys/default.nix
@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-/HvNCQWsXOJZeCxHWmsLlbBDhBzF7XP/SPLdDiWMDC4=";
  };

+  strictDeps = true;
  nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ];
  buildInputs = [ cairo libinput pango wayland wayland-protocols libxkbcommon ];

--- a/pkgs/tools/wayland/wtype/default.nix
+++ b/pkgs/tools/wayland/wtype/default.nix
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
    hash = "sha256-TfpzAi0mkXugQn70MISyNFOXIJpDwvgh3enGv0Xq8S4=";
  };

+  strictDeps = true;
  nativeBuildInputs = [ meson ninja pkg-config wayland ];
  buildInputs = [ libxkbcommon wayland ];

--- a/pkgs/tools/wayland/ydotool/default.nix
+++ b/pkgs/tools/wayland/ydotool/default.nix
@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-maXXGCqB8dkGO8956hsKSwM4HQdYn6z1jBFENQ9sKcA=";
  };

+  strictDeps = true;
  nativeBuildInputs = [ cmake scdoc ];

  postInstall = ''