commit 1a22ad6b1805d5b90dbe632aae6d91692464db6b · pyrox.dev/nixpkgs

+8 -2

pkgs/applications/audio/deadbeef/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, intltool, pkgconfig

     

       1
       1
       +
       { stdenv, fetchurl, intltool, pkgconfig, fetchpatch

     

       2
       2
        
       # deadbeef can use either gtk2 or gtk3

     

       3
       3
        
       , gtk2Support ? true, gtk2 ? null

     

       4
       4
        
       , gtk3Support ? false, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null

     
···

       51
       51
        
         name = "deadbeef-0.6.2";

     

       52
       52
        
       

     

       53
       53
        
         src = fetchurl {

     

       54
       54
       -
           url = "http://garr.dl.sourceforge.net/project/deadbeef/${name}.tar.bz2";

     

       54
       54
       +
           url = "mirror://sourceforge/project/deadbeef/${name}.tar.bz2";

     

       55
       55
        
           sha256 = "06jfsqyakpvq0xhah7dlyvdzh5ym3hhb4yfczczw11ijd1kbjcrl";

     

       56
       56
        
         };

     

       57
       57
        
       

     
···

       81
       81
        
           ++ optional gtk3Support makeWrapper;

     

       82
       82
        
       

     

       83
       83
        
         enableParallelBuilding = true;

     

       84
       84
       +
       

     

       85
       85
       +
         patches = [ (fetchpatch {

     

       86
       86
       +
                       url = "https://github.com/Alexey-Yakovenko/deadbeef/commit/e7725ea73fa1bd279a3651704870156bca8efea8.patch";

     

       87
       87
       +
                       sha256 = "0a04l2607y3swcq9b1apffl1chdwj38jwfiizxcfmdbia4a0qlyg";

     

       88
       88
       +
                     })

     

       89
       89
       +
                   ];

     

       84
       90
        
       

     

       85
       91
        
         postInstall = if !gtk3Support then "" else ''

     

       86
       92
        
           wrapProgram "$out/bin/deadbeef" \

+22

pkgs/applications/audio/deadbeef/wrapper.nix

···

       1
       1
       +
       { stdenv, buildEnv, deadbeef, makeWrapper, plugins }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
       drv = buildEnv {

     

       5
       5
       +
         name = "deadbeef-with-plugins-" + (builtins.parseDrvName deadbeef.name).version;

     

       6
       6
       +
       

     

       7
       7
       +
         paths = [ deadbeef ] ++ plugins;

     

       8
       8
       +
       

     

       9
       9
       +
         postBuild = ''

     

       10
       10
       +
           # TODO: This could be avoided if buildEnv could be forced to create all directories

     

       11
       11
       +
           if [ -L $out/bin ]; then

     

       12
       12
       +
             rm $out/bin

     

       13
       13
       +
             mkdir $out/bin

     

       14
       14
       +
             for i in ${deadbeef}/bin/*; do

     

       15
       15
       +
               ln -s $i $out/bin

     

       16
       16
       +
             done

     

       17
       17
       +
           fi

     

       18
       18
       +
           wrapProgram $out/bin/deadbeef \

     

       19
       19
       +
             --set DEADBEEF_PLUGIN_DIR "$out/lib/deadbeef"

     

       20
       20
       +
         '';

     

       21
       21
       +
         };

     

       22
       22
       +
       in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })

+4

pkgs/top-level/all-packages.nix

···

       11011
       11011
        
       

     

       11012
       11012
        
         deadbeef-mpris2-plugin = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { };

     

       11013
       11013
        
       

     

       11014
       11014
       +
         deadbeef-with-plugins = callPackage ../applications/audio/deadbeef/wrapper.nix {

     

       11015
       11015
       +
           plugins = [];

     

       11016
       11016
       +
         };

     

       11017
       11017
       +
       

     

       11014
       11018
        
         dfasma = callPackage ../applications/audio/dfasma { };

     

       11015
       11019
        
       

     

       11016
       11020
        
         dia = callPackage ../applications/graphics/dia {