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
base: 9b1c2c479b3f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 52ad76f07453
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 20, 2018

  1. kitty: fix locating libstartup-notification-1 

    Startup notification doesn't work in recent versions of Kitty:
> Traceback (most recent call last):
>   File "/nix/store/3a3b0xd952gp8jw70k5kh3a4zhgzf0p7-kitty-0.12.3/bin/../lib/kitty/kitty/utils.py", line 216, in init_startup_notification
>     return init_startup_notification_x11(window_handle, startup_id)
>   File "/nix/store/3a3b0xd952gp8jw70k5kh3a4zhgzf0p7-kitty-0.12.3/bin/../lib/kitty/kitty/utils.py", line 201, in init_startup_notification_x11
>     return init_x11_startup_notification(display, window_handle, sid)
> OSError: Failed to load libstartup-notification-1.so with error: libstartup-notification-1.so: cannot open shared object file: No such file or directory

Apparently dispatching of startup notification has been moved to a C
binding in kitty 0.6.0 [1] so the substituion had to be modified to reflect
that. Without this fix Kitty still works except that window managers
which depend on startup notifications to be fired (e.g. Awesome)
cannot apply special placement rules.

The substitution mechanism is also changed to use a patch file to detect
this kind of mistakes in the future.

[1]: kovidgoyal/kitty@b08f4ab
    Vaskó László committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    1842c4a View commit details
    Browse the repository at this point in the history

  2. kitty: fixing environment variable substituition in docs/Makefile 

    The previous substitutution only worked by accident as make requires
environment variables to be enclosed in curly brackets as shown in this
excerpt from the build output:
> PYTHONPATH=YTHONPATH:.. HOME=MPDIR/nowhere sphinx-build -M html "." "_build" -T

The substituition is moved to the existing patch file to simplify the
builder expression.
    Vaskó László committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    2fdfa21 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #48747 from vlaci/master 

    kitty: fix locating libstartup-notification-1
    @Mic92
    Mic92 committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    52ad76f View commit details
    Browse the repository at this point in the history