diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2016-11-25 13:19:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-25 13:19:56 +0100 |
commit | 00597a07bb90d5db57b8526a10ea1042d4d8721b (patch) | |
tree | 7dd40cb1a2287cda66bc0d45a342d9d3539da7e6 /pkgs/tools/X11 | |
parent | 15f19733581823a6b24a8f0d75237a1e09d3ef9f (diff) | |
parent | b4077f32101d7f98ff0e0fe19b91ff23db15de28 (diff) | |
download | nixlib-00597a07bb90d5db57b8526a10ea1042d4d8721b.tar nixlib-00597a07bb90d5db57b8526a10ea1042d4d8721b.tar.gz nixlib-00597a07bb90d5db57b8526a10ea1042d4d8721b.tar.bz2 nixlib-00597a07bb90d5db57b8526a10ea1042d4d8721b.tar.lz nixlib-00597a07bb90d5db57b8526a10ea1042d4d8721b.tar.xz nixlib-00597a07bb90d5db57b8526a10ea1042d4d8721b.tar.zst nixlib-00597a07bb90d5db57b8526a10ea1042d4d8721b.zip |
Merge pull request #20644 from romildo/upd.xcape
xcape: git-2015-03-01 -> 1.2
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r-- | pkgs/tools/X11/xcape/default.nix | 57 |
1 files changed, 34 insertions, 23 deletions
diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index 5436edd0ea37..894f082a708c 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -1,31 +1,42 @@ -{stdenv, fetchurl, fetchgit, libX11, xproto, libXtst, xextproto, pkgconfig -, inputproto, libXi}: +{ stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xextproto, +libXi }: + let - s = rec { - baseName = "xcape"; - version = "git-2015-03-01"; - name = "${baseName}-${version}"; - }; - buildInputs = [ - libX11 libXtst xproto xextproto pkgconfig inputproto libXi - ]; + baseName = "xcape"; + version = "1.2"; in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchgit { - url = https://github.com/alols/xcape; - rev = "f3802fc086ce9d961d644a5d29ad5b650db56215"; - sha256 = "0d79riwzmjr621ss3yhxqn2q8chn3f9rvk2nnjckz5yxbifvfg9s"; + +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "alols"; + repo = baseName; + rev = "v${version}"; + sha256 = "09a05cxgrip6nqy1qmwblamp2bhknqnqmxn7i2a1rgxa0nba95dm"; }; - preConfigure = '' - makeFlags="$makeFlags PREFIX=$out" - ''; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libX11 libXtst xextproto libXi ]; + + makeFlags = [ "PREFIX=$(out)" "MANDIR=/share/man/man1" ]; + + postInstall = "install -D --target-directory $out/share/doc README.md"; + meta = { - inherit (s) version; - description = ''A tool to have Escape and Control on a single key''; + description = "Utility to configure modifier keys to act as other keys"; + longDescription = '' + xcape allows you to use a modifier key as another key when + pressed and released on its own. Note that it is slightly + slower than pressing the original key, because the pressed event + does not occur until the key is released. The default behaviour + is to generate the Escape key when Left Control is pressed and + released on its own. + ''; + homepage = "https://github.com/alols/xcape"; license = stdenv.lib.licenses.gpl3 ; - maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; }; } |