Merge pull request #228135 from wegank/audacity-bump
audacity: 3.2.5 -> 3.3.0
This commit is contained in:
commit
7c2405b15d
1 changed files with 8 additions and 3 deletions
|
@ -61,17 +61,19 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "audacity";
|
pname = "audacity";
|
||||||
version = "3.2.5";
|
version = "3.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "Audacity-${version}";
|
rev = "Audacity-${version}";
|
||||||
hash = "sha256-tMz55fZh+TfvLEyApDqC0QMd2hEQLJsNQ6y2Xy0xgaQ=";
|
hash = "sha256-OQX3YFUdK9TR7ZuN2dZc6ZAWaqfftk5VH0qoOwbTAuM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
mkdir src/private
|
mkdir src/private
|
||||||
|
substituteInPlace scripts/build/macOS/fix_bundle.py \
|
||||||
|
--replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')"
|
||||||
'' + lib.optionalString stdenv.isLinux ''
|
'' + lib.optionalString stdenv.isLinux ''
|
||||||
substituteInPlace libraries/lib-files/FileNames.cpp \
|
substituteInPlace libraries/lib-files/FileNames.cpp \
|
||||||
--replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
|
--replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
|
||||||
|
@ -151,13 +153,16 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
|
|
||||||
|
# Fix duplicate store paths
|
||||||
|
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||||
];
|
];
|
||||||
|
|
||||||
# [ 57%] Generating LightThemeAsCeeCode.h...
|
# [ 57%] Generating LightThemeAsCeeCode.h...
|
||||||
# ../../utils/image-compiler: error while loading shared libraries:
|
# ../../utils/image-compiler: error while loading shared libraries:
|
||||||
# lib-theme.so: cannot open shared object file: No such file or directory
|
# lib-theme.so: cannot open shared object file: No such file or directory
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
export LD_LIBRARY_PATH=$PWD/utils
|
export LD_LIBRARY_PATH=$PWD/Release/lib/audacity
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = false; # Test fails
|
doCheck = false; # Test fails
|
||||||
|
|
Loading…
Reference in a new issue