Unverified Commit 4766c30e authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

audacity: fix build on x86_64-darwin (#223386)

parent 107e9dd8

pkgs/applications/audio/audacity/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ stdenv.mkDerivation rec { 
  '' + lib.optionalString stdenv.isLinux ''

    substituteInPlace libraries/lib-files/FileNames.cpp \

      --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h

  '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11.0") ''

    sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm

  '';



  nativeBuildInputs = [
@@ -93,9 +95,6 @@ stdenv.mkDerivation rec { 
    ffmpeg_4

    file

    flac

  ] ++ lib.optionals stdenv.isDarwin [

    AppKit

  ] ++ [

    gtk3

    lame

    libid3tag
@@ -135,6 +134,7 @@ stdenv.mkDerivation rec { 
    libuuid

    util-linux

  ] ++ lib.optionals stdenv.isDarwin [

    AppKit

    CoreAudioKit # for portaudio

    libpng

    libjpeg

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -28705,8 +28705,8 @@ with pkgs; 
  };

  audaciousQt5 = audacious;













  audacity = darwin.apple_sdk_11_0.callPackage ../applications/audio/audacity {













    inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudioKit;













  audacity = callPackage ../applications/audio/audacity {













    inherit (darwin.apple_sdk.frameworks) AppKit CoreAudioKit;















  };





























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