diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-09-14 17:40:49 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-09-14 17:40:49 +0300 |
| commit | d9ac1c31b2e530120fa7e344b4e90b45bc097366 (patch) | |
| tree | 7e44d174acc63f43b2857d76ae56d6a9f9c40760 /pkgs/tools | |
| parent | 9c8508386a3c63c1e84d59de6f65d9a93ef01a7d (diff) | |
| parent | a395ceed4081a421338f2654c8d02c7089a819a0 (diff) | |
| download | nixlib-d9ac1c31b2e530120fa7e344b4e90b45bc097366.tar nixlib-d9ac1c31b2e530120fa7e344b4e90b45bc097366.tar.gz nixlib-d9ac1c31b2e530120fa7e344b4e90b45bc097366.tar.bz2 nixlib-d9ac1c31b2e530120fa7e344b4e90b45bc097366.tar.lz nixlib-d9ac1c31b2e530120fa7e344b4e90b45bc097366.tar.xz nixlib-d9ac1c31b2e530120fa7e344b4e90b45bc097366.tar.zst nixlib-d9ac1c31b2e530120fa7e344b4e90b45bc097366.zip | |
Merge pull request #9819 from gebner/xdotool-3-20150503-1
xdotool: 2.20110530.1 -> 3.20150503.1
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/X11/keynav/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/tools/X11/xdotool/default.nix | 17 |
2 files changed, 22 insertions, 14 deletions
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 0b41e05e3f21..edddf42d2c55 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -1,17 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, libX11, xextproto, libXtst, libXi, libXext +{ stdenv, fetchFromGitHub, pkgconfig, libX11, xextproto, libXtst, libXi, libXext , libXinerama, glib, cairo, xdotool }: +let release = "20150730"; in stdenv.mkDerivation rec { - name = "keynav-0.20110708.0"; + name = "keynav-0.${release}.0"; - src = fetchurl { - url = "https://semicomplete.googlecode.com/files/${name}.tar.gz"; - sha256 = "1gizjhji3yspxxxvb90js3z1bv18rbf5phxg8rciixpj3cccff8z"; + src = fetchFromGitHub { + owner = "jordansissel"; + repo = "keynav"; + rev = "4ae486db6697877e84b66583a0502afc7301ba16"; + sha256 = "0v1m8w877fcrk918p6b6q3753dsz8i1f4mb9bi064cp11kh85nq5"; }; buildInputs = [ pkgconfig libX11 xextproto libXtst libXi libXext libXinerama glib cairo xdotool ]; + patchPhase = '' + echo >>VERSION MAJOR=0 + echo >>VERSION RELEASE=${release} + echo >>VERSION REVISION=0 + ''; + installPhase = '' mkdir -p $out/bin $out/share/keynav/doc diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 2eeb61dfaf4c..4c675a69842c 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, libX11, perl, libXtst, xextproto, libXi, libXinerama }: +{ stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xextproto, libXi, libXinerama, libxkbcommon }: -let version = "2.20110530.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "xdotool-${version}"; + version = "3.20150503.1"; src = fetchurl { - url = "http://semicomplete.googlecode.com/files/xdotool-${version}.tar.gz"; - sha256 = "0rxggg1cy7nnkwidx8x2w3c5f3pk6dh2b6q0q7hp069r3n5jrd77"; + url = "https://github.com/jordansissel/xdotool/releases/download/v${version}/xdotool-${version}.tar.gz"; + sha256 = "1lcngsw33fy9my21rdiz1gs474bfdqcfxjrnfggbx4aypn1nhcp8"; }; - buildInputs = [ libX11 perl libXtst xextproto libXi libXinerama ]; + nativeBuildInputs = [ pkgconfig perl ]; + buildInputs = [ libX11 libXtst xextproto libXi libXinerama libxkbcommon ]; - configurePhase = '' - export makeFlags="PREFIX=$out"; - ''; + makeFlags = "PREFIX=$(out)"; meta = { homepage = http://www.semicomplete.com/projects/xdotool/; |