diff options
Diffstat (limited to 'pkgs/applications/window-managers')
9 files changed, 37 insertions, 5 deletions
diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index e98adefa447..7ef4a7d1f6a 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { hash = "sha256-Lt/hn/K+CjcmU3Bs5wChiZq0VGNcraH4tSVYsmYnKjc="; }; + strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index caf34e543b7..a221eb7a8e6 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -10,6 +10,7 @@ , slurp , grim , jq +, bash , python3Packages }: @@ -27,8 +28,9 @@ grimshot = stdenv.mkDerivation rec { outputs = [ "out" "man" ]; + strictDeps = true; nativeBuildInputs = [ makeWrapper installShellFiles ]; - + buildInputs = [ bash ]; installPhase = '' installManPage contrib/grimshot.1 diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 727d9b4e6b3..1b662575134 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { ./sway-config-nixos-paths.patch ]; + strictDeps = true; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index da23386d41c..4b2909eac21 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "06iq12p4438d6bv3jlqsf01wjaxrzlnj1bnicn41kad563aq41xl"; }; + strictDeps = true; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols ] ++ lib.optionals systemdSupport [ systemd ]; diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index 219e2c2421c..6f1f337d23e 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -7,6 +7,7 @@ , scdoc , wayland , wayland-protocols +, wayland-scanner , libxkbcommon , cairo , gdk-pixbuf @@ -28,7 +29,8 @@ stdenv.mkDerivation rec { sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc ]; + strictDeps = true; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix index 8c2a7e91649..8ca1dd77877 100644 --- a/pkgs/applications/window-managers/sway/lock-fancy.nix +++ b/pkgs/applications/window-managers/sway/lock-fancy.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, coreutils, grim, gawk, jq, swaylock -, imagemagick, getopt, fontconfig, wmctrl, makeWrapper +, imagemagick, getopt, fontconfig, wmctrl, makeWrapper, bash }: let @@ -30,7 +30,9 @@ in stdenv.mkDerivation rec { --replace "/usr/share" "$out/share" ''; + strictDeps = true; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index b70160b1dbf..970fdfe371f 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -14,6 +14,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY="; }; + patches = [ + # remove once when updating to 1.7 + # https://github.com/swaywm/swaylock/pull/235 + (fetchpatch { + url = "https://github.com/swaywm/swaylock/commit/5a1e6ad79aa7d79b32d36cda39400f3e889b8f8f.diff"; + sha256 = "sha256-ZcZVImUzvng7sluC6q2B5UL8sVunLe4PIfc+tyw48RQ="; + }) + ]; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index c1f531683d7..1eb9693379e 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -37,6 +37,7 @@ in symlinkJoin { paths = (optional withBaseWrapper baseWrapper) ++ [ sway ]; + strictDeps = true; nativeBuildInputs = [ makeWrapper ] ++ (optional withGtkWrapper wrapGAppsHook); diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix index 9169aea4f51..eaafac71b6c 100644 --- a/pkgs/applications/window-managers/wmfs/default.nix +++ b/pkgs/applications/window-managers/wmfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, fetchpatch, libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }: stdenv.mkDerivation { pname = "wmfs"; @@ -12,6 +12,17 @@ stdenv.mkDerivation { rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2"; }; + patches = [ + # Pull patch pending upstream inclusion to fix build on + # -fno-common toolchain like upstream gcc-10: + # https://github.com/xorg62/wmfs/pull/104 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/xorg62/wmfs/commit/e4ec12618f4689d791892ebb49df9610a25d24d3.patch"; + sha256 = "0qvwry9sikvr85anzha9x4gcx0r2ckwdxqw2in2l6bl9z9d9c0w2"; + }) + ]; + buildInputs = [ imlib2 libX11 |