summary refs log tree commit diff
path: root/pkgs/applications/audio/qmmp
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2018-02-03 21:24:50 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2018-02-03 21:26:41 +0100
commitbe40296afe63c582e4ec1643e7b372a2e2862b42 (patch)
tree30563a30652c2b813af64486c7d16a87814f7a88 /pkgs/applications/audio/qmmp
parent6b834384f669a16008fdc6886e235939af206bf4 (diff)
downloadnixlib-be40296afe63c582e4ec1643e7b372a2e2862b42.tar
nixlib-be40296afe63c582e4ec1643e7b372a2e2862b42.tar.gz
nixlib-be40296afe63c582e4ec1643e7b372a2e2862b42.tar.bz2
nixlib-be40296afe63c582e4ec1643e7b372a2e2862b42.tar.lz
nixlib-be40296afe63c582e4ec1643e7b372a2e2862b42.tar.xz
nixlib-be40296afe63c582e4ec1643e7b372a2e2862b42.tar.zst
nixlib-be40296afe63c582e4ec1643e7b372a2e2862b42.zip
qmmp: 1.1.10 -> 1.2.0
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
Diffstat (limited to 'pkgs/applications/audio/qmmp')
-rw-r--r--pkgs/applications/audio/qmmp/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 77c82f1737c6..6b816cdeec10 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -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 =