commit 39e6bf76474ce742eb027a88c4da6331f0a1526f · pyrox.dev/nixpkgs

+31 -8

pkgs/applications/audio/audacity/default.nix

···

       28
       28
        
       , ffmpeg

     

       29
       29
        
       , soundtouch

     

       30
       30
        
       , pcre /*, portaudio - given up fighting their portaudio.patch */

     

       31
       31
       +
       , linuxHeaders

     

       31
       32
        
       , at-spi2-core ? null

     

       32
       33
        
       , dbus ? null

     

       33
       34
        
       , epoxy ? null

     
···

       41
       42
        
       }:

     

       42
       43
        
       

     

       43
       44
        
       # TODO

     

       44
       44
       -
       # - as of 2.4.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions

     

       45
       45
       +
       # - as of 3.0.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions

     

       45
       46
        
       # - detach sbsms

     

       46
       47
        
       

     

       48
       48
       +
       let

     

       49
       49
       +
         wxGTK-audacity = wxGTK.overrideAttrs (oldAttrs: rec {

     

       50
       50
       +
           src = fetchFromGitHub {

     

       51
       51
       +
             owner = "audacity";

     

       52
       52
       +
             repo = "wxWidgets";

     

       53
       53
       +
             rev = "07e7d832c7a337aedba3537b90b2c98c4d8e2985";

     

       54
       54
       +
             sha256 = "1mawnkcrmqj98jp0jxlnh9xkc950ca033ccb51c7035pzmi9if9a";

     

       55
       55
       +
             fetchSubmodules = true;

     

       56
       56
       +
           };

     

       57
       57
       +
         });

     

       58
       58
       +
       in

     

       47
       59
        
       stdenv.mkDerivation rec {

     

       48
       60
        
         pname = "audacity";

     

       49
       49
       -
         version = "2.4.2";

     

       61
       61
       +
         version = "3.0.2";

     

       50
       62
        
       

     

       51
       63
        
         src = fetchFromGitHub {

     

       52
       64
        
           owner = "audacity";

     

       53
       65
        
           repo = "audacity";

     

       54
       66
        
           rev = "Audacity-${version}";

     

       55
       55
       -
           sha256 = "sha256-hpRTo5B0EMyzORopsNPOgv6mohBkwJfWfCLnPvFmdFI=";

     

       67
       67
       +
           sha256 = "035qq2ff16cdl2cb9iply2bfjmhfl1dpscg79x6c9l0i9m8k41zj";

     

       56
       68
        
         };

     

       57
       69
        
       

     

       58
       70
        
         patches = [

     

       59
       71
        
           (fetchpatch {

     

       60
       60
       -
             url = "https://github.com/audacity/audacity/commit/a070b5d8a8ba10fb86edba6aeb8fdab0f66ba408.patch";

     

       61
       61
       -
             sha256 = "sha256-8UZupGcN+/tytAhyy5T1P0nufvsQPeyLgOUMGt7l8Oc=";

     

       72
       72
       +
             url = "https://github.com/audacity/audacity/commit/007852e51fcbb5f1f359d112f28b8984a604dac6.patch";

     

       73
       73
       +
             sha256 = "0zp2iydd46analda9cfnbmzdkjphz5m7dynrdj5qdnmq6j3px9fw";

     

       62
       74
        
             name = "audacity_xdg_paths.patch";

     

       63
       75
        
           })

     

       64
       76
        
         ];

     
···

       66
       78
        
         # this file *should* be generated by cmake but as of 2.4.2 isn't yet

     

       67
       79
        
         postPatch = ''

     

       68
       80
        
           touch src/RevisionIdent.h

     

       81
       81
       +
         '';

     

       82
       82
       +
       

     

       83
       83
       +
         preConfigure = ''

     

       84
       84
       +
           substituteInPlace src/FileNames.cpp --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h

     

       69
       85
        
         '';

     

       70
       86
        
       

     

       71
       87
        
         # workaround for a broken cmake. Drop it with a later version to see if it works.

     
···

       86
       102
        
           "-lswscale"

     

       87
       103
        
         ];

     

       88
       104
        
       

     

       89
       89
       -
         nativeBuildInputs = [ cmake gettext pkg-config python3 ];

     

       105
       105
       +
         nativeBuildInputs = [

     

       106
       106
       +
           cmake

     

       107
       107
       +
           gettext

     

       108
       108
       +
           pkg-config

     

       109
       109
       +
           python3

     

       110
       110
       +
         ] ++ lib.optionals stdenv.isLinux [

     

       111
       111
       +
           linuxHeaders

     

       112
       112
       +
         ];

     

       90
       113
        
       

     

       91
       114
        
         buildInputs = [

     

       92
       115
        
           alsaLib

     
···

       110
       133
        
           sratom

     

       111
       134
        
           suil

     

       112
       135
        
           twolame

     

       113
       113
       -
           wxGTK

     

       114
       114
       -
           wxGTK.gtk

     

       136
       136
       +
           wxGTK-audacity

     

       137
       137
       +
           wxGTK-audacity.gtk

     

       115
       138
        
         ] ++ lib.optionals stdenv.isLinux [

     

       116
       139
        
           at-spi2-core

     

       117
       140
        
           dbus

+1 -3

pkgs/top-level/all-packages.nix

···

       22160
       22160
        
         audacious = libsForQt5.callPackage ../applications/audio/audacious { };

     

       22161
       22161
        
         audaciousQt5 = audacious;

     

       22162
       22162
        
       

     

       22163
       22163
       -
         audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; };

     

       22164
       22164
       -
         audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; };

     

       22165
       22165
       -
         audacity = audacity-gtk2;

     

       22163
       22163
       +
         audacity = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; };

     

       22166
       22164
        
       

     

       22167
       22165
        
         audio-recorder = callPackage ../applications/audio/audio-recorder { };

     

       22168
       22166