Merge branch 'master.upstream' into staging.upstream

2015-10-30 17:16:07 -07:00
parent 99fe4f97c5 a7d573f224
commit dd2de66d61
320 changed files with 26241 additions and 2581 deletions
@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
      "--with-dbuspolicydir=$(out)/etc/dbus-1/system.d"
      "--with-dbussystemservicedir=$(out)/share/dbus-1/system-services"
      "--with-dbussessionservicedir=$(out)/share/dbus-1/services"
-      "--with-firmware-path=/root/test-firmware:/run/current-system/firmware"
      "--with-tty-gid=3" # tty in NixOS has gid 3
      "--enable-compat-libs" # get rid of this eventually
      "--disable-tests"