cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #129096 from Mindavi/sway-idle-lock/cross

Browse source 
swayidle, swaylock: support cross-compilation
This commit is contained in:
Ben Siraphob 2021-07-03 16:26:23 +07:00 committed by GitHub
commit 4b2e88d6f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/window-managers/sway/idle.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, meson, ninja, pkg-config, scdoc , meson, ninja, pkg-config, scdoc, wayland-scanner
, wayland, wayland-protocols, systemd , wayland, wayland-protocols, systemd
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace "version: '1.5'" "version: '${version}'" --replace "version: '1.5'" "version: '${version}'"
''; '';
nativeBuildInputs = [ meson ninja pkg-config scdoc ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
buildInputs = [ wayland wayland-protocols systemd ]; buildInputs = [ wayland wayland-protocols systemd ];
mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ]; mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ];

4
pkgs/applications/window-managers/sway/lock.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, meson, ninja, pkg-config, scdoc , meson, ninja, pkg-config, scdoc, wayland-scanner
, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace "version: '1.4'" "version: '${version}'" --replace "version: '1.4'" "version: '${version}'"
''; '';
nativeBuildInputs = [ meson ninja pkg-config scdoc ]; 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 = [