Skip to content

Commit

Permalink
qmmp: 1.1.10 -> 1.2.0
Browse files Browse the repository at this point in the history
Fixes build failure since recent merge of staging branch:

$ nix-build -A qmmp
[...]
AutoMoc error
-------------
Included moc files with the same name will be generated from different sources.
Consider to
 - not include the "moc_<NAME>.cpp" file
 - add a directory prefix to a "<NAME>.moc" include (e.g "sub/<NAME>.moc")
 - rename the source file(s)
Include conflicts
-----------------
"moc_hotkeymanager.cpp" included in
 - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager_win.cpp"
 - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager_x11.cpp"
would be generated from
 - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager.h"
 - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager.h"

make[2]: *** [src/plugins/General/hotkey/CMakeFiles/hotkey_autogen.dir/build.make:58: src/plugins/General/hotkey/CMakeFiles/hotkey_autogen] Error 1
  • Loading branch information
bjornfor committed Feb 3, 2018
1 parent 6b83438 commit be40296
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/audio/qmmp/default.nix
Expand Up @@ -29,11 +29,11 @@
# handle that.

stdenv.mkDerivation rec {
name = "qmmp-1.1.10";
name = "qmmp-1.2.0";

src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
sha256 = "16hb3s48filq0q18m7x9vmhpirk4fh0aqj8kwbapv8mkcnzq2mqy";
sha256 = "17kci7srgbkk62dgxlmg3lv2y7z04jsinpgx6jmxjpnpblpcj840";
};

buildInputs =
Expand Down

0 comments on commit be40296

Please sign in to comment.