swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #42880: libinput: split .bin output

Browse source
This commit is contained in:
Vladimír Čunát 2018-08-30 15:29:32 +02:00
parent 03c1f567d5 ab539ab863
commit 6f2f91f307
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/x11/hardware/libinput.nix
View file

@ -205,7 +205,7 @@ in {
})
];
services.udev.packages = [ pkgs.libinput ];
services.udev.packages = [ pkgs.libinput.out ];
services.xserver.config =
''

6
pkgs/development/libraries/libinput/default.nix
View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
sha256 = "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk";
};
outputs = [ "out" "dev" ];
outputs = [ "bin" "out" "dev" ];
mesonFlags = [
(mkFlag documentationSupport "documentation")
@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
(mkFlag testsSupport "tests")
];
preConfigure = ''
mesonFlags="$mesonFlags --libexecdir=$bin/libexec"
'';
nativeBuildInputs = [ pkgconfig meson ninja ]
++ optionals documentationSupport [ doxygen graphviz ]
++ optionals testsSupport [ check valgrind python3Packages.pyparsing ];