JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #46152 from Ma27/fix-setxkbmap-completion

Browse Source 
zsh: patch `_setxkbmap` completion script
This commit is contained in:
Maximilian Bosch 2018-10-19 14:33:04 +02:00 committed by GitHub
commit e8fb77a944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/xserver.nix
View File

@ -631,6 +631,8 @@ in
] ]
++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh; ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh;
environment.pathsToLink = [ "/share/X11" ];
xdg = { xdg = {
autostart.enable = true; autostart.enable = true;
menus.enable = true; menus.enable = true;

11
pkgs/shells/zsh/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, pcre }: { stdenv, fetchurl, ncurses, pcre, fetchpatch }:
let let
version = "5.6.2"; version = "5.6.2";
@ -18,6 +18,15 @@ stdenv.mkDerivation {
sha256 = "17iffliqcj4hv91g0bd2sxsyfcz51mfyh97sp2iyrs2p0mndc2x5"; sha256 = "17iffliqcj4hv91g0bd2sxsyfcz51mfyh97sp2iyrs2p0mndc2x5";
}; };
patches = [
(fetchpatch {
name = "search-xdg-data-dirs.patch";
url = https://github.com/zsh-users/zsh/commit/624219e0e4cbfdfb286e707bd2853f2d7b6a4a7d.patch;
sha256 = "0i0g7dc0px57vpklm1f4w20vyc92nv15y09r5clvib2kjkxjy2cf";
excludes = [ "ChangeLog" ];
})
];
buildInputs = [ ncurses pcre ]; buildInputs = [ ncurses pcre ];
configureFlags = [ configureFlags = [