diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2012-12-27 06:05:12 -0800 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2012-12-27 06:05:12 -0800 |
commit | 15d69893226f73654537b75de46328d0181be1ff (patch) | |
tree | f91b937e0e41cd495c60805d3605093434162339 /pkgs | |
parent | e3ad10bca83d2144985a2d92d6f98602cb222649 (diff) | |
parent | c27b55667311641cad40a41a26e47f2c5d26ac52 (diff) | |
download | nixpkgs-15d69893226f73654537b75de46328d0181be1ff.tar nixpkgs-15d69893226f73654537b75de46328d0181be1ff.tar.gz nixpkgs-15d69893226f73654537b75de46328d0181be1ff.tar.bz2 nixpkgs-15d69893226f73654537b75de46328d0181be1ff.tar.lz nixpkgs-15d69893226f73654537b75de46328d0181be1ff.tar.xz nixpkgs-15d69893226f73654537b75de46328d0181be1ff.tar.zst nixpkgs-15d69893226f73654537b75de46328d0181be1ff.zip |
Merge pull request #232 from ierton/xkb-switch
Xkb switch
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/lib/maintainers.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/X11/xkb-switch/default.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index d0ba6b8b6a5..b065a50ce00 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -37,6 +37,7 @@ sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; shlevy = "Shea Levy <shea@shealevy.com>"; simons = "Peter Simons <simons@cryp.to>"; + smironov = "Sergey Mironov <ierton@gmail.com>"; thammers = "Tobias Hammerschmidt <jawr@gmx.de>"; urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; viric = "LluĂs Batlle i Rossell <viric@viric.name>"; diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix new file mode 100644 index 00000000000..0fc49038efe --- /dev/null +++ b/pkgs/tools/X11/xkb-switch/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchgit, cmake, libX11 }: + +stdenv.mkDerivation rec { + name = "xkb-switch-1.2"; + + src = fetchgit { + url = https://github.com/ierton/xkb-switch.git; + rev = "4c90511ecf2cacc040c97f034a13254c3fa9dfef"; + sha256 = "1jxya67v1qnvbzd0cd5gj7xrwvxyfy1rpa70l8p30p9cmw3ahk41"; + }; + + buildInputs = [ cmake libX11 ]; + + meta = { + description = "Switch X layouts from the command line"; + homepage = https://github.com/ierton/xkb-switch.git; + maintainers = with stdenv.lib.maintainers; [smironov]; + platforms = stdenv.lib.platforms.gnu; + license = "BSD"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0c0b650e20..a4d26ebd773 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8093,6 +8093,8 @@ let base14Fonts = "${ghostscript}/share/ghostscript/fonts"; }; + xkb_switch = callPackage ../tools/X11/xkb-switch { }; + libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; xpra = callPackage ../tools/X11/xpra { |