From 88a82a4dc9ea13b4159c80faf4336ff2da522e95 Mon Sep 17 00:00:00 2001
From: wedens <kirill.wedens@gmail.com>
Date: Wed, 2 Jan 2019 23:09:15 +0700
Subject: [PATCH] xkb-switch: 1.3.1 -> 1.5.0, rename from xkb_switch

---
 pkgs/misc/vim-plugins/overrides.nix   |  6 +++---
 pkgs/tools/X11/xkb-switch/default.nix | 18 +++++++++---------
 pkgs/top-level/all-packages.nix       |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 307681111ac2..febdd94e1198 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , python, cmake, vim, ruby
 , which, fetchgit, llvmPackages, rustPlatform
-, xkb_switch, fzf, skim
+, xkb-switch, fzf, skim
 , python3, boost, icu, ncurses
 , ycmd, rake
 , substituteAll
@@ -308,9 +308,9 @@ self: super: {
   vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: {
     patchPhase = ''
       substituteInPlace plugin/xkbswitch.vim \
-        --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
+        --replace /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so
     '';
-    buildInputs = [ xkb_switch ];
+    buildInputs = [ xkb-switch ];
   });
 
   vim-yapf = super.vim-yapf.overrideAttrs(old: {
diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix
index 4afa56f7fe27..e3bbd5990757 100644
--- a/pkgs/tools/X11/xkb-switch/default.nix
+++ b/pkgs/tools/X11/xkb-switch/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchgit, cmake, libX11 }:
+{ stdenv, fetchFromGitHub, cmake, libX11, libxkbfile }:
 
 stdenv.mkDerivation rec {
   name = "xkb-switch-${version}";
-  version = "1.3.1";
+  version = "1.5.0";
 
-  src = fetchgit {
-    url = https://github.com/ierton/xkb-switch.git;
-    rev = "351c84370ad0fa4aaaab9a32817859b1d5fb2a11";
-    sha256 = "0ilj3amwidi7imjvi8hr62y7j8zl809r5xhs7kv816773x32gpxq";
+  src = fetchFromGitHub {
+    owner = "ierton";
+    repo = "xkb-switch";
+    rev = version;
+    sha256 = "03wk2gg3py97kx0kjzbjrikld1sa55i6mgi398jbcbiyx2gjna78";
   };
 
-  buildInputs = [ cmake libX11 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libX11 libxkbfile ];
 
   meta = with stdenv.lib; {
     description = "Switch your X keyboard layouts from the command line";
-
     homepage = https://github.com/ierton/xkb-switch;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ smironov ];
     platforms = platforms.linux;
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a7290ffb2ce..2bcb2803c0eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20240,7 +20240,7 @@ in
 
   xpointerbarrier = callPackage ../tools/X11/xpointerbarrier {};
 
-  xkb_switch = callPackage ../tools/X11/xkb-switch { };
+  xkb-switch = callPackage ../tools/X11/xkb-switch { };
 
   xkblayout-state = callPackage ../applications/misc/xkblayout-state { };