lol

pkgs/tools/wayland: enable strictDeps

Artturin 947bc96c fd0740f4

+57 -15
+6 -1
pkgs/tools/wayland/kanshi/default.nix
··· 6 6 , pkg-config 7 7 , scdoc 8 8 , wayland 9 + , wayland-scanner 9 10 }: 10 11 11 12 stdenv.mkDerivation rec { ··· 19 20 sha256 = "sha256-RVMeS2qEjTYK6r7IwMeFSqfRpKR8di2eQXhewfhTnYI="; 20 21 }; 21 22 22 - nativeBuildInputs = [ meson ninja pkg-config scdoc ]; 23 + strictDeps = true; 24 + depsBuildBuild = [ 25 + pkg-config 26 + ]; 27 + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; 23 28 buildInputs = [ wayland ]; 24 29 25 30 meta = with lib; {
+3 -1
pkgs/tools/wayland/oguri/default.nix
··· 8 8 , gdk-pixbuf 9 9 , wayland 10 10 , wayland-protocols 11 + , wayland-scanner 11 12 }: 12 13 13 14 stdenv.mkDerivation rec { ··· 21 22 sha256 = "sXNvpI/YPDPd2cXQAfRO4ut21gSCXxbo1DpaZmHJDYQ="; 22 23 }; 23 24 24 - nativeBuildInputs = [ pkg-config meson ninja ]; 25 + strictDeps = true; 26 + nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ]; 25 27 buildInputs = [ 26 28 cairo 27 29 gdk-pixbuf
+3
pkgs/tools/wayland/slurp/default.nix
··· 8 8 , libxkbcommon 9 9 , wayland 10 10 , wayland-protocols 11 + , wayland-scanner 11 12 , buildDocs ? true, scdoc 12 13 }: 13 14 ··· 22 23 sha256 = "sha256-5ZB34rqLyZmfjT/clxNRDmF0qgITFZ5xt/gIEXQzvQE="; 23 24 }; 24 25 26 + strictDeps = true; 25 27 nativeBuildInputs = [ 26 28 meson 27 29 ninja 28 30 pkg-config 31 + wayland-scanner 29 32 ] ++ lib.optional buildDocs scdoc; 30 33 31 34 buildInputs = [
+1
pkgs/tools/wayland/swaykbdd/default.nix
··· 11 11 sha256 = "sha256-umYPVkkYeu6TyVkjDsVBsRZLYh8WyseCPdih85kTz6A="; 12 12 }; 13 13 14 + strictDeps = true; 14 15 nativeBuildInputs = [ meson ninja pkg-config ]; 15 16 buildInputs = [ json_c ]; 16 17
+3 -2
pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
··· 1 1 { lib 2 2 , fetchFromGitHub 3 3 , ocamlPackages 4 - , buildPackages 5 4 }: 6 5 7 6 ocamlPackages.buildDunePackage rec { ··· 23 22 useDune2 = true; 24 23 minimumOCamlVersion = "4.08"; 25 24 25 + strictDeps = true; 26 26 nativeBuildInputs = [ 27 - buildPackages.ocamlPackages.ppx_cstruct 27 + ocamlPackages.ppx_cstruct 28 28 ]; 29 29 30 30 buildInputs = with ocamlPackages; [ ··· 32 32 cmdliner 33 33 logs 34 34 cstruct-lwt 35 + ppx_cstruct 35 36 ]; 36 37 37 38 doCheck = true;
+1
pkgs/tools/wayland/wayland-utils/default.nix
··· 12 12 sha256 = "1h38l850ww6hxjb1l8iwa33nkbz8q88bw6lh0aryjyp8b16crzk4"; 13 13 }; 14 14 15 + strictDeps = true; 15 16 depsBuildBuild = [ pkg-config ]; 16 17 nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ]; 17 18 buildInputs = [ wayland wayland-protocols ];
+4
pkgs/tools/wayland/wev/default.nix
··· 20 20 sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms"; 21 21 }; 22 22 23 + # for scdoc 24 + depsBuildBuild = [ 25 + pkg-config 26 + ]; 23 27 nativeBuildInputs = [ pkg-config scdoc wayland-scanner ]; 24 28 buildInputs = [ wayland wayland-protocols libxkbcommon ]; 25 29
+3 -1
pkgs/tools/wayland/wl-clipboard-x11/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, wl-clipboard }: 1 + { lib, stdenv, fetchFromGitHub, wl-clipboard, bash }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "wl-clipboard-x11"; ··· 11 11 hash = "sha256-i+oF1Mu72O5WPTWzqsvo4l2CERWWp4Jq/U0DffPZ8vg="; 12 12 }; 13 13 14 + strictDeps = true; 15 + buildInputs = [ bash ]; 14 16 makeFlags = [ "PREFIX=${placeholder "out"}" ]; 15 17 16 18 postPatch = ''
+4 -3
pkgs/tools/wayland/wl-clipboard/default.nix
··· 6 6 , pkg-config 7 7 , wayland 8 8 , wayland-protocols 9 + , wayland-scanner 9 10 }: 10 11 11 12 stdenv.mkDerivation rec { ··· 19 20 sha256 = "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d"; 20 21 }; 21 22 22 - nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; 23 - buildInputs = [ wayland ]; 23 + strictDeps = true; 24 + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; 25 + buildInputs = [ wayland wayland-protocols ]; 24 26 25 27 meta = with lib; { 26 28 homepage = "https://github.com/bugaevc/wl-clipboard"; ··· 30 32 platforms = platforms.linux; 31 33 }; 32 34 } 33 - # TODO: is wayland-protocols a nativeBuildInput or a buildInput?
+3
pkgs/tools/wayland/wl-color-picker/default.nix
··· 7 7 , wl-clipboard 8 8 , imagemagick 9 9 , makeWrapper 10 + , bash 10 11 }: 11 12 12 13 stdenv.mkDerivation rec { ··· 20 21 sha256 = "sha256-lvhpXy4Sd1boYNGhbPoZTJlBhlW5obltDOrEzB1Gq0A="; 21 22 }; 22 23 24 + strictDeps = true; 23 25 nativeBuildInputs = [ makeWrapper ]; 26 + buildInputs = [ bash ]; 24 27 25 28 patchPhase = '' 26 29 substituteInPlace Makefile \
+3 -2
pkgs/tools/wayland/wl-gammactl/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub 2 2 , meson, pkg-config, ninja 3 - , wayland, wayland-scanner, wlroots, wlr-protocols, gtk3 3 + , wayland, wayland-scanner, wlroots, wlr-protocols, gtk3, glib 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { ··· 14 14 sha256 = "8iMJK4O/sNIGPOBZQEfK47K6OjT6sxYFe19O2r/VSr8="; 15 15 }; 16 16 17 - nativeBuildInputs = [ meson pkg-config ninja ]; 17 + strictDeps = true; 18 + nativeBuildInputs = [ meson pkg-config ninja glib wayland-scanner ]; 18 19 buildInputs = [ wayland wlroots gtk3 ]; 19 20 20 21 postUnpack = ''
+5 -3
pkgs/tools/wayland/wl-mirror/default.nix
··· 8 8 , wayland-scanner 9 9 , wlr-protocols 10 10 , libGL 11 + , bash 11 12 , installExampleScripts ? true 12 13 , makeWrapper 13 14 , pipectl ··· 35 36 hash = "sha256-D5uUKaepcSW9v2x6uBeLGXAyuLorlt4Lb6lZD/prfp8="; 36 37 }; 37 38 39 + strictDeps = true; 40 + nativeBuildInputs = [ cmake pkg-config wayland-scanner makeWrapper ]; 41 + buildInputs = [ libGL wayland wayland-protocols wlr-protocols bash ]; 42 + 38 43 postPatch = '' 39 44 echo 'v${version}' > version.txt 40 45 substituteInPlace CMakeLists.txt \ ··· 49 54 postInstall = lib.optionalString installExampleScripts '' 50 55 wrapProgram $out/bin/wl-present --prefix PATH ":" ${wl-present-binpath} 51 56 ''; 52 - 53 - nativeBuildInputs = [ cmake pkg-config wayland-scanner makeWrapper ]; 54 - buildInputs = [ libGL wayland wayland-protocols wlr-protocols ]; 55 57 56 58 meta = with lib; { 57 59 homepage = "https://github.com/Ferdi265/wl-mirror";
+1
pkgs/tools/wayland/wlr-randr/default.nix
··· 19 19 sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ="; 20 20 }; 21 21 22 + strictDeps = true; 22 23 nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; 23 24 buildInputs = [ wayland ]; 24 25
+6 -2
pkgs/tools/wayland/wlrctl/default.nix
··· 1 - { lib, stdenv, fetchFromSourcehut, meson, pkg-config, scdoc, ninja, libxkbcommon, wayland }: 1 + { lib, stdenv, fetchFromSourcehut, meson, pkg-config, scdoc, ninja, libxkbcommon, wayland, wayland-scanner }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "wlrctl"; ··· 11 11 sha256 = "039cxc82k7x473n6d65jray90rj35qmfdmr390zy0c7ic7vn4b78"; 12 12 }; 13 13 14 - nativeBuildInputs = [ meson pkg-config scdoc ninja ]; 14 + strictDeps = true; 15 + depsBuildBuild = [ 16 + pkg-config 17 + ]; 18 + nativeBuildInputs = [ meson pkg-config scdoc ninja wayland-scanner ]; 15 19 buildInputs = [ libxkbcommon wayland ]; 16 20 17 21 NIX_CFLAGS_COMPILE = "-Wno-error=type-limits";
+4
pkgs/tools/wayland/wlsunset/default.nix
··· 14 14 sha256 = "0hhsddh3rs066rbsjksr8kcwg8lvglbvs67dq0r5wx5c1xcwb51w"; 15 15 }; 16 16 17 + strictDeps = true; 18 + depsBuildBuild = [ 19 + pkg-config 20 + ]; 17 21 nativeBuildInputs = [ meson pkg-config ninja wayland-scanner scdoc ]; 18 22 buildInputs = [ wayland wayland-protocols ]; 19 23
+4
pkgs/tools/wayland/wob/default.nix
··· 22 22 sha256 = "sha256-CXRBNnnhNV5LBIasVtmGrRG4ZXFGC7qNInU7Y0QsHbs="; 23 23 }; 24 24 25 + strictDeps = true; 26 + depsBuildBuild = [ 27 + pkg-config 28 + ]; 25 29 nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; 26 30 buildInputs = [ wayland wayland-protocols ] 27 31 ++ lib.optional stdenv.isLinux libseccomp;
+1
pkgs/tools/wayland/wshowkeys/default.nix
··· 14 14 sha256 = "sha256-/HvNCQWsXOJZeCxHWmsLlbBDhBzF7XP/SPLdDiWMDC4="; 15 15 }; 16 16 17 + strictDeps = true; 17 18 nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ]; 18 19 buildInputs = [ cairo libinput pango wayland wayland-protocols libxkbcommon ]; 19 20
+1
pkgs/tools/wayland/wtype/default.nix
··· 21 21 hash = "sha256-TfpzAi0mkXugQn70MISyNFOXIJpDwvgh3enGv0Xq8S4="; 22 22 }; 23 23 24 + strictDeps = true; 24 25 nativeBuildInputs = [ meson ninja pkg-config wayland ]; 25 26 buildInputs = [ libxkbcommon wayland ]; 26 27
+1
pkgs/tools/wayland/ydotool/default.nix
··· 11 11 sha256 = "sha256-maXXGCqB8dkGO8956hsKSwM4HQdYn6z1jBFENQ9sKcA="; 12 12 }; 13 13 14 + strictDeps = true; 14 15 nativeBuildInputs = [ cmake scdoc ]; 15 16 16 17 postInstall = ''