pyrox.dev / nixpkgs
lol
fork atom

audacity: fix for darwin

Dmitry Kalinkin 7095591d 4f742d3e

+46 -17
unified split
+37 -15
pkgs/applications/audio/audacity/default.nix
··· 3 , fetchFromGitHub 4 , fetchpatch 5 , cmake 6 - , wxGTK 7 , pkg-config 8 , python3 9 , gettext ··· 18 , sqlite 19 , sratom 20 , suil 21 - , alsa-lib 22 , libsndfile 23 , soxr 24 , flac ··· 28 , libopus 29 , ffmpeg 30 , soundtouch 31 - , pcre /*, portaudio - given up fighting their portaudio.patch */ 32 , linuxHeaders 33 , at-spi2-core 34 , dbus 35 , libepoxy ··· 40 , libsepol 41 , libxkbcommon 42 , util-linux 43 }: 44 45 # TODO ··· 49 let 50 inherit (lib) optionals; 51 52 wxGTK' = wxGTK.overrideAttrs (oldAttrs: rec { 53 - src = fetchFromGitHub { 54 - owner = "audacity"; 55 - repo = "wxWidgets"; 56 - rev = "07e7d832c7a337aedba3537b90b2c98c4d8e2985"; 57 - sha256 = "1mawnkcrmqj98jp0jxlnh9xkc950ca033ccb51c7035pzmi9if9a"; 58 - fetchSubmodules = true; 59 - }; 60 }); 61 62 in ··· 88 89 postPatch = '' 90 touch src/RevisionIdent.h 91 - 92 substituteInPlace src/FileNames.cpp \ 93 --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h 94 ''; ··· 116 ]; 117 118 buildInputs = [ 119 - alsa-lib 120 expat 121 ffmpeg 122 file ··· 138 sratom 139 suil 140 twolame 141 - wxGTK' 142 - wxGTK'.gtk 143 ] ++ optionals stdenv.isLinux [ 144 at-spi2-core 145 dbus 146 libepoxy ··· 151 libselinux 152 libsepol 153 util-linux 154 ]; 155 156 doCheck = false; # Test fails ··· 160 homepage = "https://www.audacityteam.org/"; 161 license = licenses.gpl2Plus; 162 maintainers = with maintainers; [ lheckemann ]; 163 - platforms = platforms.linux; 164 }; 165 }
··· 3 , fetchFromGitHub 4 , fetchpatch 5 , cmake 6 , pkg-config 7 , python3 8 , gettext ··· 17 , sqlite 18 , sratom 19 , suil 20 , libsndfile 21 , soxr 22 , flac ··· 26 , libopus 27 , ffmpeg 28 , soundtouch 29 + , pcre 30 + /*, portaudio - given up fighting their portaudio.patch */ 31 , linuxHeaders 32 + , alsa-lib 33 , at-spi2-core 34 , dbus 35 , libepoxy ··· 40 , libsepol 41 , libxkbcommon 42 , util-linux 43 + , wxGTK 44 + , AppKit ? null 45 + , AudioToolbox ? null 46 + , AudioUnit ? null 47 + , Carbon ? null 48 + , Cocoa ? null 49 + , CoreAudio ? null 50 + , CoreAudioKit ? null 51 + , CoreServices ? null 52 + , wxmac 53 }: 54 55 # TODO ··· 59 let 60 inherit (lib) optionals; 61 62 + wxWidgets_src = fetchFromGitHub { 63 + owner = "audacity"; 64 + repo = "wxWidgets"; 65 + rev = "07e7d832c7a337aedba3537b90b2c98c4d8e2985"; 66 + sha256 = "1mawnkcrmqj98jp0jxlnh9xkc950ca033ccb51c7035pzmi9if9a"; 67 + fetchSubmodules = true; 68 + }; 69 + 70 wxGTK' = wxGTK.overrideAttrs (oldAttrs: rec { 71 + src = wxWidgets_src; 72 + }); 73 + 74 + wxmac' = wxmac.overrideAttrs (oldAttrs: rec { 75 + src = wxWidgets_src; 76 }); 77 78 in ··· 104 105 postPatch = '' 106 touch src/RevisionIdent.h 107 + '' + lib.optionalString stdenv.isLinux '' 108 substituteInPlace src/FileNames.cpp \ 109 --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h 110 ''; ··· 132 ]; 133 134 buildInputs = [ 135 expat 136 ffmpeg 137 file ··· 153 sratom 154 suil 155 twolame 156 ] ++ optionals stdenv.isLinux [ 157 + alsa-lib # for portaudio 158 at-spi2-core 159 dbus 160 libepoxy ··· 165 libselinux 166 libsepol 167 util-linux 168 + wxGTK' 169 + wxGTK'.gtk 170 + ] ++ optionals stdenv.isDarwin [ 171 + wxmac' 172 + AppKit 173 + Cocoa 174 + CoreAudioKit 175 + AudioUnit AudioToolbox CoreAudio CoreServices Carbon # for portaudio 176 ]; 177 178 doCheck = false; # Test fails ··· 182 homepage = "https://www.audacityteam.org/"; 183 license = licenses.gpl2Plus; 184 maintainers = with maintainers; [ lheckemann ]; 185 + platforms = platforms.unix; 186 }; 187 }
+1 -1
pkgs/development/libraries/audio/suil/default.nix
··· 31 description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; 32 license = licenses.mit; 33 maintainers = with maintainers; [ goibhniu ]; 34 - platforms = platforms.linux; 35 }; 36 }
··· 31 description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; 32 license = licenses.mit; 33 maintainers = with maintainers; [ goibhniu ]; 34 + platforms = platforms.unix; 35 }; 36 }
+8 -1
pkgs/top-level/all-packages.nix
··· 24179 24180 audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; 24181 audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; }; 24182 - audacity = audacity-gtk2; 24183 24184 audio-recorder = callPackage ../applications/audio/audio-recorder { }; 24185
··· 24179 24180 audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; 24181 audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; }; 24182 + audacity = 24183 + if stdenv.isDarwin then 24184 + callPackage ../applications/audio/audacity { 24185 + inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon Cocoa CoreAudio CoreAudioKit CoreServices; 24186 + suil = suil-qt5; 24187 + } 24188 + else 24189 + audacity-gtk2; 24190 24191 audio-recorder = callPackage ../applications/audio/audio-recorder { }; 24192