From a7a75ba5c7f1800f9ec3f4ee646820545b0330c3 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 11 Apr 2019 19:22:51 +0300 Subject: [PATCH 1/2] wmctrl: adopt package --- pkgs/tools/X11/wmctrl/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index e0118b8b27b..4d52e3ec312 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -1,14 +1,20 @@ -{stdenv, fetchurl, libX11, glib, pkgconfig, libXmu }: +{ stdenv +, fetchurl +, libX11 +, glib +, pkgconfig +, libXmu +}: stdenv.mkDerivation rec { - + name = "wmctrl-1.07"; - + src = fetchurl { url = "http://tomas.styblo.name/wmctrl/dist/${name}.tar.gz"; sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; - + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu glib ]; @@ -19,5 +25,7 @@ stdenv.mkDerivation rec { description = "Command line tool to interact with an EWMH/NetWM compatible X Window Manager"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; + maintainers = [ stdenv.lib.maintainers.Anton-Latukha ]; }; + } From b6ceaf0123dd1ccab2a6176b6c6d1d59436e2183 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 11 Apr 2019 19:26:37 +0300 Subject: [PATCH 2/2] wmctrl: mv site&upstream from Google+ to current official site --- pkgs/tools/X11/wmctrl/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 4d52e3ec312..e4cb70c8f24 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -8,10 +8,12 @@ stdenv.mkDerivation rec { - name = "wmctrl-1.07"; + pname = "wmctrl"; + version = "1.07"; src = fetchurl { - url = "http://tomas.styblo.name/wmctrl/dist/${name}.tar.gz"; + # NOTE: 2019-04-11: There is also a semi-official mirror: http://tripie.sweb.cz/utils/wmctrl/ + url = "https://sites.google.com/site/tstyblo/wmctrl/${pname}-${version}.tar.gz"; sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; @@ -21,8 +23,8 @@ stdenv.mkDerivation rec { patches = [ ./64-bit-data.patch ]; meta = { - homepage = http://tomas.styblo.name/wmctrl/; - description = "Command line tool to interact with an EWMH/NetWM compatible X Window Manager"; + homepage = https://sites.google.com/site/tstyblo/wmctrl; + description = "CLI tool to interact with EWMH/NetWM compatible X Window Managers"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; maintainers = [ stdenv.lib.maintainers.Anton-Latukha ];