Merge remote-tracking branch 'upstream/master' into hardened-stdenv

3 files changed, 66 insertions, 8 deletions

diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix
new file mode 100644
index 0000000000000..27f80023bb372
--- /dev/null
+++ b/pkgs/applications/window-managers/evilwm/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl,  libX11, libXext, libXrandr, libXrender,
+  xproto, xextproto, randrproto, renderproto, kbproto,  patches ? [] }:
+
+stdenv.mkDerivation rec {
+  name = "evilwm-1.1.1";
+
+  src = fetchurl {
+    url = "http://www.6809.org.uk/evilwm/${name}.tar.gz";
+    sha256 = "79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a";
+  };
+
+  buildInputs = [ libX11 libXext libXrandr libXrender
+                  xproto xextproto randrproto renderproto kbproto ];
+
+  prePatch = ''substituteInPlace ./Makefile --replace /usr $out \
+                                            --replace "CC = gcc" "#CC = gcc"'';
+
+  # Allow users set their own list of patches
+  inherit patches;
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.6809.org.uk/evilwm/";
+    description = "Minimalist window manager for the X Window System";
+
+    license = {
+      shortName = "evilwm";
+      fullName = "Custom, inherited from aewm and 9wm";
+      url = http://www.6809.org.uk/evilwm/;
+      free = true;
+    };  # like BSD/MIT, but Share-Alike'y; See README.
+
+    maintainers = with maintainers; [ amiloradovsky ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix
new file mode 100644
index 0000000000000..36cf593a8904d
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix
@@ -0,0 +1,24 @@
+{ fetchFromGitHub, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "i3blocks-gaps-${version}";
+  version = "1.4";
+
+  src = fetchFromGitHub {
+    owner = "Airblader";
+    repo = "i3blocks-gaps";
+    rev = "4cfdf93c75f729a2c96d471004d31734e923812f";
+    sha256 = "0v9307ij8xzwdaxay3r75sd2cp453s3qb6q7dy9fks2p6wwqpazi";
+  };
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} VERSION=${version}";
+
+  meta = with stdenv.lib; {
+    description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps";
+    homepage = https://github.com/Airblader/i3blocks-gaps;
+    license = licenses.gpl3;
+    maintainers = [ "carlsverre" ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix
index 33dcfe8adf455..5a1f583b6535e 100644
--- a/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python, which
+{ stdenv, fetchurl, unzip, pkgconfig, libixp_hg, txt2tags, dash, python, which
 , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }:
 
 stdenv.mkDerivation rec {
@@ -6,15 +6,14 @@ stdenv.mkDerivation rec {
   version = "hg-2012-12-09";
   name = "wmii-${version}";
 
-  src = fetchhg {
-    url = https://code.google.com/p/wmii/;
-    sha256 = "1wqw41jb2fhq902a04ixfzmx0lia1pawahm1ymyrs3is6mm32r51";
-    inherit rev;
+  src = fetchurl {
+    url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip;
+    sha256 = "1wmkq14zvmfrmydl8752xz852cy7agrx3qp4fy2cc5asb2r9abaz";
   };
 
   # for dlopen-ing
   patchPhase = ''
-    substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "${libXft}/lib/libXft.so"
+    substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "$(pkg-config --variable=libdir xft)/libXft.so.2"
     substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which"
   '';
 
@@ -30,14 +29,14 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  buildInputs = [ pkgconfig libixp_hg txt2tags dash python which
+  buildInputs = [ unzip pkgconfig libixp_hg txt2tags dash python which
                   libX11 libXrender libXext libXinerama libXrandr libXft ];
 
   # For some reason including mercurial in buildInputs did not help
   makeFlags = "WMII_HGVERSION=hg${rev}";
 
   meta = {
-    homepage = "https://code.google.com/p/wmii/";
+    homepage = "https://code.google.com/archive/p/wmii/";
     description = "A small window manager controlled by a 9P filesystem";
     maintainers = with stdenv.lib.maintainers; [ kovirobi ];
     license = stdenv.lib.licenses.mit;