Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lirc: use xorg.* packages directly instead of xlibsWrapper indirection #201239

Merged
merged 1 commit into from
Nov 18, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions pkgs/development/libraries/lirc/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3,
alsa-lib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, autoreconfHook
, pkg-config
, help2man
, python3

, alsa-lib
, libxslt
, systemd
, libusb-compat-0_1
, libftdi1
, libICE
, libSM
, libX11
}:

let
pythonEnv = python3.pythonForBuild.withPackages (p: with p; [ pyyaml setuptools ]);
Expand Down Expand Up @@ -54,7 +70,7 @@ stdenv.mkDerivation rec {

depsBuildBuild = [ pkg-config ];

buildInputs = [ alsa-lib xlibsWrapper systemd libusb-compat-0_1 libftdi1 ];
buildInputs = [ alsa-lib systemd libusb-compat-0_1 libftdi1 libICE libSM libX11 ];

DEVINPUT_HEADER = "include/linux/input-event-codes.h";

Expand Down