Merge branch 'master' into staging

2015-06-25 09:15:05 -05:00
parent 3dd96b1a2c 99d20189b8
commit a8c52d0958
117 changed files with 13095 additions and 14673 deletions
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {

  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

+  preFixup = ''
+    sed 's,-ludev,-L${udev}/lib -ludev,' -i $out/lib/libusb-1.0.la
+  '';
+
  meta = {
    homepage = http://www.libusb.info;
    description = "User-space USB library";