Unverified Commit 952beb58 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

audacity: unbreak (#429334)

parents 4c9721c7 4965a358

pkgs/by-name/au/audacity/package.nix

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-kESKpIke9Xi4A55i3mUu1JkDjp8voBJBixiAK8pUkKA=";

  };



  patches = [

    # Introduced by https://github.com/Tencent/rapidjson/commit/b1c0c2843fcb2aca9ecc650fc035c57ffc13697c#diff-2f1bcf2729ff7c408adb0c2cc2cfa01602bd5646b05b3e4bc7e46b606035d249R21

    ./rapidjson.patch

  ];



  postPatch = ''

    mkdir src/private

    substituteInPlace scripts/build/macOS/fix_bundle.py \

pkgs/by-name/au/audacity/rapidjson.patch

0 → 100644
+18 −0
Original line number Diff line number Diff line 
diff --git a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake

index ba95962..66a96a8 100644

--- a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake

+++ b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake

@@ -2,8 +2,11 @@

 

 if(NOT ${_OPT}use_rapidjson STREQUAL "off")

    if(NOT TARGET rapidjson::rapidjson)

-      if(TARGET rapidjson)

-         add_library( rapidjson::rapidjson ALIAS rapidjson )

+      if(TARGET RapidJSON)

+         if(NOT TARGET rapidjson)

+            add_library(rapidjson ALIAS RapidJSON)

+         endif()

+         add_library( rapidjson::rapidjson ALIAS RapidJSON )

       else()

          # At least on Arch RapidJSONConfig.cmake does not define a target at all

          # so we have to do it ourselves