Merge branch 'master' into phonon-gstreamer

2017-03-10 07:30:14 -06:00
parent edd43351cf 7dcc40b674
commit 64b88c3017
335 changed files with 8501 additions and 4455 deletions
@@ -55,6 +55,10 @@ stdenv.mkDerivation rec {
    [ gstreamer gst-plugins-base phonon ]
    ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]);

+  # 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 =