diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-03-10 07:30:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-10 07:30:14 -0600 |
| commit | 64b88c3017089c55bbf7fb272696f62a4369a187 (patch) | |
| tree | 450ea7af379fe6405fc59fc9e7f98ccc9bdc48bc /pkgs/development/libraries/phonon | |
| parent | edd43351cfa861a5e641a4c25666bbd3bc181f67 (diff) | |
| parent | 7dcc40b674e98ef9216262a969888ca9342728de (diff) | |
Merge branch 'master' into phonon-gstreamer
Diffstat (limited to 'pkgs/development/libraries/phonon')
| -rw-r--r-- | pkgs/development/libraries/phonon/backends/gstreamer.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 9fdcf65346cc2..e0f24fbc822ab 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -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 = |