diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-04-25 15:50:18 +0300 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-04-25 15:50:18 +0300 |
| commit | 3f4787cbf569100673c597cc812285b5ddaae5f5 (patch) | |
| tree | 0796ee0d49fd76fdaea2056f4f4a5d8a41f960eb | |
| parent | 90a8b9e3febfc1e615ff8308ed2418d48ba4eb6a (diff) | |
| download | nixpkgs-3f4787cbf569100673c597cc812285b5ddaae5f5.tar nixpkgs-3f4787cbf569100673c597cc812285b5ddaae5f5.tar.gz nixpkgs-3f4787cbf569100673c597cc812285b5ddaae5f5.tar.bz2 nixpkgs-3f4787cbf569100673c597cc812285b5ddaae5f5.tar.lz nixpkgs-3f4787cbf569100673c597cc812285b5ddaae5f5.tar.xz nixpkgs-3f4787cbf569100673c597cc812285b5ddaae5f5.tar.zst nixpkgs-3f4787cbf569100673c597cc812285b5ddaae5f5.zip | |
audacity: 3.2.5 -> 3.3.0
| -rw-r--r-- | pkgs/applications/audio/audacity/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 24d610f62d0..fcaebc059b1 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -61,17 +61,19 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.2.5"; + version = "3.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Audacity-${version}"; - hash = "sha256-tMz55fZh+TfvLEyApDqC0QMd2hEQLJsNQ6y2Xy0xgaQ="; + hash = "sha256-OQX3YFUdK9TR7ZuN2dZc6ZAWaqfftk5VH0qoOwbTAuM="; }; postPatch = '' mkdir src/private + substituteInPlace scripts/build/macOS/fix_bundle.py \ + --replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" '' + lib.optionalString stdenv.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ --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/ "-DCMAKE_SKIP_BUILD_RPATH=ON" + + # Fix duplicate store paths + "-DCMAKE_INSTALL_LIBDIR=lib" ]; # [ 57%] Generating LightThemeAsCeeCode.h... # ../../utils/image-compiler: error while loading shared libraries: # lib-theme.so: cannot open shared object file: No such file or directory preBuild = '' - export LD_LIBRARY_PATH=$PWD/utils + export LD_LIBRARY_PATH=$PWD/Release/lib/audacity ''; doCheck = false; # Test fails |