Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 03c1f567d593
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6f2f91f30706
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 19, 2018

  1. libinput: split utilities to a bin output 

    libinput builds some executables which are useful for debugging or
unusual configurations, but not necessary in normal use of the library.
(See libinput(1) and the other referenced man pages.)

Some of these programs require Python, which makes the closure
significantly larger. Splitting /libexec/ and /bin/ to a separate "bin"
output allows systems that don't need these utilities to avoid the
substantial size hit.
    @jameysharp
    jameysharp committed Jun 19, 2018
    Copy the full SHA
    ae09fe2 View commit details

Commits on Aug 30, 2018

  1. libinput: make .bin the first output 

    That's the convention:
    @vcunat
    vcunat committed Aug 30, 2018
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ab539ab View commit details

  2. Merge #42880: libinput: split .bin output

    @vcunat
    vcunat committed Aug 30, 2018
    Copy the full SHA
    6f2f91f View commit details
Showing with 6 additions and 2 deletions.
  1. +1 −1 nixos/modules/services/x11/hardware/libinput.nix
  2. +5 −1 pkgs/development/libraries/libinput/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/hardware/libinput.nix
View file
Original file line number Diff line number Diff line change
@@ -205,7 +205,7 @@ in {
})
];

services.udev.packages = [ pkgs.libinput ];
services.udev.packages = [ pkgs.libinput.out ];

services.xserver.config =
''
6 changes: 5 additions & 1 deletion pkgs/development/libraries/libinput/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,14 +23,18 @@ stdenv.mkDerivation rec {
sha256 = "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk";
};

outputs = [ "out" "dev" ];
outputs = [ "bin" "out" "dev" ];

mesonFlags = [
(mkFlag documentationSupport "documentation")
(mkFlag eventGUISupport "debug-gui")
(mkFlag testsSupport "tests")
];

preConfigure = ''
mesonFlags="$mesonFlags --libexecdir=$bin/libexec"
'';

nativeBuildInputs = [ pkgconfig meson ninja ]
++ optionals documentationSupport [ doxygen graphviz ]
++ optionals testsSupport [ check valgrind python3Packages.pyparsing ];