diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-09-23 09:31:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-23 09:31:28 +0200 |
| commit | 56853dc6d83a861050bbc02041dbe65f7b1b6f63 (patch) | |
| tree | 70fdf276f8d889018a3ec9fc573e01fa961d289c /pkgs/development/libraries/libinput/default.nix | |
| parent | 343ac4d2fc6029ef6a2451d31890903f6afe79f2 (diff) | |
| parent | 92158a4b2cda39ab3990682aa23644462e1a5860 (diff) | |
| download | nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.gz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.bz2 nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.lz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.xz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.zst nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.zip | |
Merge pull request #45941 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/development/libraries/libinput/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libinput/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 5498a32e7091..d42bd315d22f 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -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 ]; |