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: b1a9bcfb1610
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c2b9b8031f30
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 18, 2017

  1. nixos: Use xkbDir consistently so it has an effect

    @benley
    benley committed Mar 18, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    b79c284 View commit details

Commits on Mar 23, 2017

  1. Merge pull request #24026 from benley/use-xkbDir 

    nixos: Use xkbDir consistently so it has an effect
    @globin
    globin authored Mar 23, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    c2b9b80 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 nixos/modules/services/x11/desktop-managers/enlightenment.nix
  2. +1 −1 nixos/modules/services/x11/desktop-managers/plasma5.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/enlightenment.nix
View file
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ in
security.wrappers.e_freqset.source = "${e.enlightenment.out}/bin/e_freqset";

environment.etc = singleton
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
{ source = xcfg.xkbDir;
target = "X11/xkb";
};

2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/plasma5.nix
View file
Original file line number Diff line number Diff line change
@@ -176,7 +176,7 @@ in
environment.pathsToLink = [ "/share" ];

environment.etc = singleton {
source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
source = xcfg.xkbDir;
target = "X11/xkb";
};