pyrox.dev / nixpkgs
lol
fork atom

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

Bjørn Forsman be40296a 6b834384

options
unified split
Changed files
+2 -2
pkgs
applications
audio
qmmp
default.nix
+2 -2
pkgs/applications/audio/qmmp/default.nix 
···

       
29

       
29

       
 

       
# handle that.


     

       
30

       
30

       
 

       



     

       
31

       
31

       
 

       
stdenv.mkDerivation rec {


     

       
32

       

       
-

       
  name = "qmmp-1.1.10";


     

       

       
32

       
+

       
  name = "qmmp-1.2.0";


     

       
33

       
33

       
 

       



     

       
34

       
34

       
 

       
  src = fetchurl {


     

       
35

       
35

       
 

       
    url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";


     

       
36

       

       
-

       
    sha256 = "16hb3s48filq0q18m7x9vmhpirk4fh0aqj8kwbapv8mkcnzq2mqy";


     

       

       
36

       
+

       
    sha256 = "17kci7srgbkk62dgxlmg3lv2y7z04jsinpgx6jmxjpnpblpcj840";


     

       
37

       
37

       
 

       
  };


     

       
38

       
38

       
 

       



     

       
39

       
39

       
 

       
  buildInputs =