diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-28 10:46:13 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-28 10:46:13 +0100 |
| commit | dce0ca29d91e71e357f591b1c19ef4e1094785d6 (patch) | |
| tree | 0bfdca07fce6135d13e60a99110043f0730f8e9c /pkgs/tools/X11 | |
| parent | 778f317820532a09cfe43287516d3be9ce62925b (diff) | |
| parent | e328078fe0867c432be6f14bc200f9932617783e (diff) | |
| download | nixpkgs-dce0ca29d91e71e357f591b1c19ef4e1094785d6.tar nixpkgs-dce0ca29d91e71e357f591b1c19ef4e1094785d6.tar.gz nixpkgs-dce0ca29d91e71e357f591b1c19ef4e1094785d6.tar.bz2 nixpkgs-dce0ca29d91e71e357f591b1c19ef4e1094785d6.tar.lz nixpkgs-dce0ca29d91e71e357f591b1c19ef4e1094785d6.tar.xz nixpkgs-dce0ca29d91e71e357f591b1c19ef4e1094785d6.tar.zst nixpkgs-dce0ca29d91e71e357f591b1c19ef4e1094785d6.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/xcape/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/X11/xmousepasteblock/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/tools/X11/xsecurelock/default.nix | 4 |
3 files changed, 24 insertions, 3 deletions
diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index 8b0c18c8618..d1b6f9b23b6 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -3,7 +3,7 @@ libXi }: stdenv.mkDerivation rec { pname = "xcape"; - version = "unstable-20180301"; + version = "unstable-2018-03-01"; src = fetchFromGitHub { owner = "alols"; diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix new file mode 100644 index 00000000000..0cace7f452b --- /dev/null +++ b/pkgs/tools/X11/xmousepasteblock/default.nix @@ -0,0 +1,21 @@ +{ xorg, stdenv, libev, fetchFromGitHub, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "xmousepasteblock"; + version = "1.0"; + src = fetchFromGitHub { + owner = "milaq"; + repo = "XMousePasteBlock"; + sha256 = "0vidckfp277cg2gsww8a8q5b18m10iy4ppyp2qipr89771nrcmns"; + rev = version; + }; + makeFlags = "PREFIX=$(out)"; + buildInputs = with xorg; [ libX11 libXext libXi libev ]; + nativeBuildInputs = [ pkgconfig ]; + meta = with stdenv.lib; { + description = "Middle mouse button primary X selection/clipboard paste disabler"; + homepage = https://github.com/milaq/XMousePasteBlock; + license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.petercommand ]; + }; +} diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 8349953f4ff..548101c34c3 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xsecurelock"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "google"; repo = "xsecurelock"; rev = "v${version}"; - sha256 = "0zdwszscdw0p7kwpqqv1dywn00bq1wak2x602lb6hdmkffspi8bg"; + sha256 = "020y2mi4sshc5dghcz37aj5wwizbg6712rzq2a72f8z8m7mnxr5y"; }; nativeBuildInputs = [ |