Merge staging-next into staging

2018-11-18 10:41:34 +01:00
parent 0a085d508a 3aa6b8ccc5
commit 0d0d7dcd06
422 changed files with 65253 additions and 65218 deletions
--- a/pkgs/misc/drivers/xboxdrv/default.nix
+++ b/pkgs/misc/drivers/xboxdrv/default.nix
@@ -11,12 +11,10 @@ in stdenv.mkDerivation {
    sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id";
  };

-  patchPhase = ''
-    substituteInPlace Makefile --replace /usr/local "$out"
-  '';
-
+  makeFlags = "PREFIX=$(out)";
  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ scons libX11 libusb1 boost glib dbus-glib];
+  buildInputs = [ scons libX11 libusb1 boost glib dbus-glib ];
+  dontUseSconsInstall = true;

  meta = with stdenv.lib; {
    homepage = https://pingus.seul.org/~grumbel/xboxdrv/;