diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2018-10-19 14:33:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-19 14:33:04 +0200 |
| commit | e8fb77a9446c557057a7c8b6cac70fa6721260ee (patch) | |
| tree | 1c369f41d787d2517e56e6eac6bf36a5b428f933 | |
| parent | b3b0769eced575f7a8e09888fd3a627fb1fb4c41 (diff) | |
| parent | 18d461533ba7e4d0981f164bbc4423a141bfa51e (diff) | |
| download | nixpkgs-e8fb77a9446c557057a7c8b6cac70fa6721260ee.tar nixpkgs-e8fb77a9446c557057a7c8b6cac70fa6721260ee.tar.gz nixpkgs-e8fb77a9446c557057a7c8b6cac70fa6721260ee.tar.bz2 nixpkgs-e8fb77a9446c557057a7c8b6cac70fa6721260ee.tar.lz nixpkgs-e8fb77a9446c557057a7c8b6cac70fa6721260ee.tar.xz nixpkgs-e8fb77a9446c557057a7c8b6cac70fa6721260ee.tar.zst nixpkgs-e8fb77a9446c557057a7c8b6cac70fa6721260ee.zip | |
Merge pull request #46152 from Ma27/fix-setxkbmap-completion
zsh: patch `_setxkbmap` completion script
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 297e3631165..070a0247343 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -631,6 +631,8 @@ in ] ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh; + environment.pathsToLink = [ "/share/X11" ]; + xdg = { autostart.enable = true; menus.enable = true; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index a14829070b3..472b78c4a6d 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pcre }: +{ stdenv, fetchurl, ncurses, pcre, fetchpatch }: let version = "5.6.2"; @@ -18,6 +18,15 @@ stdenv.mkDerivation { 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 ]; configureFlags = [ |