Unverified Commit 2543ab97 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #181133: staging-next 2022-07-11

parents a0446082 c698c07c
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@
        "adapter.auto-port-config": {
          "mode": "dsp",
          "monitor": false,
          "control": false,
          "position": "unknown"
        }
      }
@@ -109,6 +110,7 @@
        "adapter.auto-port-config": {
          "mode": "dsp",
          "monitor": false,
          "control": false,
          "position": "unknown"
        }
      }
+3 −0
Original line number Diff line number Diff line
@@ -167,6 +167,9 @@ in stdenv.mkDerivation rec {
    "-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON"
    "-Daudacity_conan_enabled=Off"
    "-Daudacity_use_ffmpeg=loaded"

    # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
    "-DCMAKE_SKIP_BUILD_RPATH=ON"
  ];

  doCheck = false; # Test fails
+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ stdenv.mkDerivation rec {
    cp in-formant $out/bin
  '';

  # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
  cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];

  meta = with lib; {
    description = "A real-time pitch and formant tracking software";
    homepage = "https://github.com/in-formant/in-formant";
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
  nativeBuildInputs = [ pkg-config meson ninja ];
  buildInputs = [ lv2 rnnoise-nu ];

  mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2");
  mesonFlags = [ "--prefix=${placeholder "out"}/lib/lv2" ];

  postPatch = ''
    substituteInPlace meson.build \
+5 −0
Original line number Diff line number Diff line
@@ -138,6 +138,11 @@ stdenv.mkDerivation rec {
    util-linux
  ];

  cmakeFlags = [
    # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
    "-DCMAKE_SKIP_BUILD_RPATH=ON"
  ];

  meta = with lib; {
    description = "Sound editor with graphical UI";
    homepage = "https://tenacityaudio.org/";
Loading