Merge pull request #172093 from Artturin/fixes1
This commit is contained in:
commit
78cc0998e3
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
|
|||||||
hash = "sha256-Lt/hn/K+CjcmU3Bs5wChiZq0VGNcraH4tSVYsmYnKjc=";
|
hash = "sha256-Lt/hn/K+CjcmU3Bs5wChiZq0VGNcraH4tSVYsmYnKjc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
depsBuildBuild = [ pkg-config ];
|
depsBuildBuild = [ pkg-config ];
|
||||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
|
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
|
||||||
buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ];
|
buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ];
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
, slurp
|
, slurp
|
||||||
, grim
|
, grim
|
||||||
, jq
|
, jq
|
||||||
|
, bash
|
||||||
|
|
||||||
, python3Packages
|
, python3Packages
|
||||||
}:
|
}:
|
||||||
@ -27,8 +28,9 @@ grimshot = stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
outputs = [ "out" "man" ];
|
outputs = [ "out" "man" ];
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||||
|
buildInputs = [ bash ];
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
installManPage contrib/grimshot.1
|
installManPage contrib/grimshot.1
|
||||||
|
|
||||||
|
@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
|
|||||||
./sway-config-nixos-paths.patch
|
./sway-config-nixos-paths.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
depsBuildBuild = [
|
depsBuildBuild = [
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
|
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "06iq12p4438d6bv3jlqsf01wjaxrzlnj1bnicn41kad563aq41xl";
|
sha256 = "06iq12p4438d6bv3jlqsf01wjaxrzlnj1bnicn41kad563aq41xl";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
|
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
|
||||||
buildInputs = [ wayland wayland-protocols ]
|
buildInputs = [ wayland wayland-protocols ]
|
||||||
++ lib.optionals systemdSupport [ systemd ];
|
++ lib.optionals systemdSupport [ systemd ];
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
, scdoc
|
, scdoc
|
||||||
, wayland
|
, wayland
|
||||||
, wayland-protocols
|
, wayland-protocols
|
||||||
|
, wayland-scanner
|
||||||
, libxkbcommon
|
, libxkbcommon
|
||||||
, cairo
|
, cairo
|
||||||
, gdk-pixbuf
|
, gdk-pixbuf
|
||||||
@ -36,7 +37,8 @@ stdenv.mkDerivation rec {
|
|||||||
sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build
|
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 ];
|
buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, coreutils, grim, gawk, jq, swaylock
|
{ lib, stdenv, fetchFromGitHub, coreutils, grim, gawk, jq, swaylock
|
||||||
, imagemagick, getopt, fontconfig, wmctrl, makeWrapper
|
, imagemagick, getopt, fontconfig, wmctrl, makeWrapper, bash
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -30,7 +30,9 @@ in stdenv.mkDerivation rec {
|
|||||||
--replace "/usr/share" "$out/share"
|
--replace "/usr/share" "$out/share"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
buildInputs = [ bash ];
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub
|
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||||
, meson, ninja, pkg-config, scdoc, wayland-scanner
|
, meson, ninja, pkg-config, scdoc, wayland-scanner
|
||||||
, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam
|
, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam
|
||||||
}:
|
}:
|
||||||
@ -14,6 +14,17 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY=";
|
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 ];
|
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
|
||||||
buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
|
buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
|
||||||
|
|
||||||
|
@ -37,6 +37,7 @@ in symlinkJoin {
|
|||||||
paths = (optional withBaseWrapper baseWrapper)
|
paths = (optional withBaseWrapper baseWrapper)
|
||||||
++ [ sway ];
|
++ [ sway ];
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
nativeBuildInputs = [ makeWrapper ]
|
nativeBuildInputs = [ makeWrapper ]
|
||||||
++ (optional withGtkWrapper wrapGAppsHook);
|
++ (optional withGtkWrapper wrapGAppsHook);
|
||||||
|
|
||||||
|
@ -351,6 +351,10 @@ self: super:
|
|||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
xcbutilerrors = super.xcbutilerrors.overrideAttrs (attrs: {
|
||||||
|
outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
|
||||||
|
});
|
||||||
|
|
||||||
xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: {
|
xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: {
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
meta = attrs.meta // { maintainers = [ lib.maintainers.lovek323 ]; };
|
meta = attrs.meta // { maintainers = [ lib.maintainers.lovek323 ]; };
|
||||||
|
Loading…
Reference in New Issue
Block a user