Merge branch 'master' into staging

2017-03-07 21:59:32 +01:00
parent 9eb2f4cb9e ac0021ce53
commit b86b7c04a3
297 changed files with 7050 additions and 3773 deletions
@@ -38,6 +38,10 @@ stdenv.mkDerivation rec {
    "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include"
  ];

+  # cleanup: the build system creates (empty) $out/$out/share/icons (double prefix)
+  # if DESTDIR is unset
+  DESTDIR="/";
+
  nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;

  cmakeFlags =