Merge pull request #228135 from wegank/audacity-bump

audacity: 3.2.5 -> 3.3.0

authored by Weijia Wang and committed by GitHub 7c2405b1 2eb3e4c7

+8 -3
+8 -3
pkgs/applications/audio/audacity/default.nix
··· 61 62 stdenv.mkDerivation rec { 63 pname = "audacity"; 64 - version = "3.2.5"; 65 66 src = fetchFromGitHub { 67 owner = pname; 68 repo = pname; 69 rev = "Audacity-${version}"; 70 - hash = "sha256-tMz55fZh+TfvLEyApDqC0QMd2hEQLJsNQ6y2Xy0xgaQ="; 71 }; 72 73 postPatch = '' 74 mkdir src/private 75 '' + lib.optionalString stdenv.isLinux '' 76 substituteInPlace libraries/lib-files/FileNames.cpp \ 77 --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h ··· 151 152 # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ 153 "-DCMAKE_SKIP_BUILD_RPATH=ON" 154 ]; 155 156 # [ 57%] Generating LightThemeAsCeeCode.h... 157 # ../../utils/image-compiler: error while loading shared libraries: 158 # lib-theme.so: cannot open shared object file: No such file or directory 159 preBuild = '' 160 - export LD_LIBRARY_PATH=$PWD/utils 161 ''; 162 163 doCheck = false; # Test fails
··· 61 62 stdenv.mkDerivation rec { 63 pname = "audacity"; 64 + version = "3.3.0"; 65 66 src = fetchFromGitHub { 67 owner = pname; 68 repo = pname; 69 rev = "Audacity-${version}"; 70 + hash = "sha256-OQX3YFUdK9TR7ZuN2dZc6ZAWaqfftk5VH0qoOwbTAuM="; 71 }; 72 73 postPatch = '' 74 mkdir src/private 75 + substituteInPlace scripts/build/macOS/fix_bundle.py \ 76 + --replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" 77 '' + lib.optionalString stdenv.isLinux '' 78 substituteInPlace libraries/lib-files/FileNames.cpp \ 79 --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h ··· 153 154 # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ 155 "-DCMAKE_SKIP_BUILD_RPATH=ON" 156 + 157 + # Fix duplicate store paths 158 + "-DCMAKE_INSTALL_LIBDIR=lib" 159 ]; 160 161 # [ 57%] Generating LightThemeAsCeeCode.h... 162 # ../../utils/image-compiler: error while loading shared libraries: 163 # lib-theme.so: cannot open shared object file: No such file or directory 164 preBuild = '' 165 + export LD_LIBRARY_PATH=$PWD/Release/lib/audacity 166 ''; 167 168 doCheck = false; # Test fails