diff options
| author | Joris Guyonvarch <joris@guyonvarch.me> | 2017-01-09 06:07:25 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-01-09 06:07:25 +0100 |
| commit | 1603526000c2f5db86e018041677cfa80b4885a1 (patch) | |
| tree | 1cb20a64a96f9362fc4ec6ffc39c7d16d3e2f886 | |
| parent | 917e67f15fbe5890dcabe66a13b8f627bd12459b (diff) | |
| download | nixpkgs-1603526000c2f5db86e018041677cfa80b4885a1.tar nixpkgs-1603526000c2f5db86e018041677cfa80b4885a1.tar.gz nixpkgs-1603526000c2f5db86e018041677cfa80b4885a1.tar.bz2 nixpkgs-1603526000c2f5db86e018041677cfa80b4885a1.tar.lz nixpkgs-1603526000c2f5db86e018041677cfa80b4885a1.tar.xz nixpkgs-1603526000c2f5db86e018041677cfa80b4885a1.tar.zst nixpkgs-1603526000c2f5db86e018041677cfa80b4885a1.zip | |
xrectsel: init at 0.3.2 (#21153)
| -rw-r--r-- | pkgs/tools/X11/ffcast/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/tools/X11/xrectsel/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 39 insertions, 11 deletions
diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix index 936805ed17c..1e1e3f888c9 100644 --- a/pkgs/tools/X11/ffcast/default.nix +++ b/pkgs/tools/X11/ffcast/default.nix @@ -1,22 +1,20 @@ -{ stdenv, fetchgit, autoconf, automake, perl, libX11 }: +{ stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }: stdenv.mkDerivation rec { name = "ffcast-${version}"; version = "2.5.0"; - rev = "7c3bf681e7ca9b242e55dbf0c07856ed994d94e9"; - src = fetchgit { - url = https://github.com/lolilolicon/FFcast; - sha256 = "1s1y6rqjq126jvdzc75wz20szisbz8h8fkphlwxcxzl9xll17akj"; + src = fetchFromGitHub { + owner = "lolilolicon"; + repo = "FFcast"; + rev = "${version}"; + sha256 = "047y32bixhc8ksr98vwpgd0k1xxgsv2vs0n3kc2xdac4krc9454h"; }; - buildInputs = [ autoconf automake perl libX11 ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ perl libX11 ]; - preConfigure = '' - ./bootstrap - ''; - - configureFlags = [ "--enable-xrectsel" ]; + configureFlags = [ "--disable-xrectsel" ]; postBuild = '' make DESTDIR="$out" install diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix new file mode 100644 index 00000000000..f38ecab9f11 --- /dev/null +++ b/pkgs/tools/X11/xrectsel/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, libX11 }: + +stdenv.mkDerivation rec { + name = "xrectsel-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "lolilolicon"; + repo = "xrectsel"; + rev = "${version}"; + sha256 = "0prl4ky3xzch6xcb673mcixk998d40ngim5dqc5374b1ls2r6n7l"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 ]; + + postBuild = '' + make DESTDIR="$out" install + ''; + + meta = with stdenv.lib; { + description = "Print the geometry of a rectangular screen region"; + homepage = https://github.com/lolilolicon/xrectsel; + license = licenses.gpl3; + maintainers = [ maintainers.guyonvarch ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e49e4260f5f..e261d1bcfb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15707,6 +15707,8 @@ in #TODO: 'pil' is not available for python3, yet xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; }; + xrectsel = callPackage ../tools/X11/xrectsel { }; + xrestop = callPackage ../tools/X11/xrestop { }; xsd = callPackage ../development/libraries/xsd { }; |