From bfded4004799c48f47e67ae2f4de387211966fd4 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 11 Apr 2023 00:41:12 +0200 Subject: [PATCH] fix faust2jaqt packages: copy both the binary and the wrapper dontWrapQtApps = true; --- .../audio/faustPhysicalModeling/default.nix | 2 ++ .../magnetophonDSP/CharacterCompressor/default.nix | 7 +++++-- .../audio/magnetophonDSP/CompBus/default.nix | 5 +++-- .../magnetophonDSP/ConstantDetuneChorus/default.nix | 6 +++++- .../audio/magnetophonDSP/LazyLimiter/default.nix | 6 +++++- .../audio/magnetophonDSP/MBdistortion/default.nix | 6 +++++- .../audio/magnetophonDSP/RhythmDelay/default.nix | 6 +++++- .../audio/magnetophonDSP/VoiceOfFaust/default.nix | 8 ++++---- .../audio/magnetophonDSP/faustCompressors/default.nix | 5 +++-- .../audio/magnetophonDSP/pluginUtils/default.nix | 8 ++++++-- .../audio/magnetophonDSP/shelfMultiBand/default.nix | 7 +++++-- pkgs/applications/audio/mooSpace/default.nix | 10 +++++++--- pkgs/applications/audio/tambura/default.nix | 6 +++++- 13 files changed, 60 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index bc28a2238b84..4e8192b1c5cb 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; + dontWrapQtApps = true; + buildPhase = '' cd examples/physicalModeling diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index 400f268d439e..36ec1c38ca32 100644 --- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; + dontWrapQtApps = true; + buildPhase = '' faust2jaqt -vec -time -t 99999 CharacterCompressor.dsp faust2jaqt -vec -time -t 99999 CharacterCompressorMono.dsp @@ -21,8 +23,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp CharacterCompressor $out/bin/ - cp CharacterCompressorMono $out/bin/ + for f in $(find . -executable -type f); do + cp $f $out/bin/ + done mkdir -p $out/lib/lv2 cp -r CharacterCompressor.lv2/ $out/lib/lv2 cp -r CharacterCompressorMono.lv2/ $out/lib/lv2 diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 0b80aef170a0..21f5f2206f07 100644 --- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; + dontWrapQtApps = true; + buildPhase = '' for f in *.dsp; do @@ -28,8 +30,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/lv2 mv *.lv2/ $out/lib/lv2 mkdir -p $out/bin - for f in $(find . -executable -type f); - do + for f in $(find . -executable -type f); do cp $f $out/bin/ done ''; diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index 56534309733d..a5cd713ea84d 100644 --- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; + dontWrapQtApps = true; + buildPhase = '' faust2jaqt -time -vec -t 99999 ConstantDetuneChorus.dsp faust2lv2 -time -vec -t 99999 -gui ConstantDetuneChorus.dsp @@ -19,7 +21,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ConstantDetuneChorus $out/bin/ + for f in $(find . -executable -type f); do + cp $f $out/bin/ + done mkdir -p $out/lib/lv2 cp -r ConstantDetuneChorus.lv2/ $out/lib/lv2 ''; diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 4b1157de0b08..168687052dcd 100644 --- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; + dontWrapQtApps = true; + buildPhase = '' faust2jaqt -vec -time -t 99999 LazyLimiter.dsp faust2lv2 -vec -time -t 99999 -gui LazyLimiter.dsp @@ -19,7 +21,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp LazyLimiter $out/bin/ + for f in $(find . -executable -type f); do + cp $f $out/bin/ + done mkdir -p $out/lib/lv2 cp -r LazyLimiter.lv2/ $out/lib/lv2 ''; diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index 32f43eaed9cb..e8798424cc12 100644 --- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; + dontWrapQtApps = true; + buildPhase = '' faust2jaqt -time -vec -t 99999 MBdistortion.dsp faust2lv2 -time -vec -gui -t 99999 MBdistortion.dsp @@ -26,7 +28,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp MBdistortion $out/bin/ + for f in $(find . -executable -type f); do + cp $f $out/bin/ + done mkdir -p $out/lib/lv2 cp -r MBdistortion.lv2/ $out/lib/lv2 ''; diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index fff4292cd761..fb55af1dcebd 100644 --- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; + dontWrapQtApps = true; + buildPhase = '' faust2jaqt -time -vec -t 99999 RhythmDelay.dsp faust2lv2 -time -vec -t 99999 -gui RhythmDelay.dsp @@ -19,7 +21,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp RhythmDelay $out/bin/ + for f in $(find . -executable -type f); do + cp $f $out/bin/ + done mkdir -p $out/lib/lv2 cp -r RhythmDelay.lv2/ $out/lib/lv2 ''; diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 6bc8cff22615..2135af507b6a 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { runtimeInputs = [ pitchTracker ]; + dontWrapQtApps = true; + patchPhase = '' sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/pitchTracker @@ -32,10 +34,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - for file in ./*; do - if test -x "$file" && test -f "$file"; then - cp "$file" "$out/bin" - fi + for f in $(find . -executable -type f); do + cp $f $out/bin/ done cp launchers/* $out/bin/ diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index fd55bae6fd61..a89b4e56485e 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; + dontWrapQtApps = true; + buildPhase = '' echo "hack out autoComp.dsp due to https://github.com/grame-cncm/faust/407/issues " rm autoComp.dsp @@ -33,8 +35,7 @@ stdenv.mkDerivation rec { mv *.lv2/ $out/lib/lv2 mkdir -p $out/bin rm newlib.sh - for f in $(find . -executable -type f); - do + for f in $(find . -executable -type f); do cp $f $out/bin/ done ''; diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index fd807dd42455..5230ed327e23 100644 --- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; + dontWrapQtApps = true; + buildPhase = '' for f in *.dsp do @@ -28,8 +30,10 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/lv2 mv *.lv2/ $out/lib/lv2 mkdir -p $out/bin - cp * $out/bin/ - ''; + for f in $(find . -executable -type f); do + cp $f $out/bin/ + done + ''; meta = { description = "Some simple utility lv2 plugins"; diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index 07d4402578ca..51f6baf70424 100644 --- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; + dontWrapQtApps = true; + buildPhase = '' faust2jaqt -vec -double -time -t 99999 shelfMultiBand.dsp faust2jaqt -vec -double -time -t 99999 shelfMultiBandMono.dsp @@ -21,8 +23,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp shelfMultiBand $out/bin/ - cp shelfMultiBandMono $out/bin/ + for f in $(find . -executable -type f); do + cp $f $out/bin/ + done mkdir -p $out/lib/lv2 cp -r shelfMultiBand.lv2/ $out/lib/lv2 cp -r shelfMultiBandMono.lv2/ $out/lib/lv2 diff --git a/pkgs/applications/audio/mooSpace/default.nix b/pkgs/applications/audio/mooSpace/default.nix index b7d7502d25ab..6d67d83f9875 100644 --- a/pkgs/applications/audio/mooSpace/default.nix +++ b/pkgs/applications/audio/mooSpace/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { patchPhase = "mv ${pname}_faust.dsp ${pname}.dsp"; + dontWrapQtApps = true; + buildPhase = '' faust2jaqt -time -vec -t 0 ${pname}.dsp faust2lv2 -time -vec -t 0 -gui ${pname}.dsp @@ -21,9 +23,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ${pname} $out/bin/ - mkdir -p $out/lib/lv2 - cp -r ${pname}.lv2 $out/lib/lv2 + for f in $(find . -executable -type f); do + cp $f $out/bin/ + done + mkdir -p $out/lib/lv2 + cp -r ${pname}.lv2 $out/lib/lv2 ''; meta = { diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix index b1a6513c7f73..e1d62754c449 100644 --- a/pkgs/applications/audio/tambura/default.nix +++ b/pkgs/applications/audio/tambura/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; + dontWrapQtApps = true; + buildPhase = '' faust2jaqt -vec -time -t 99999 ${pname}.dsp faust2lv2 -vec -time -gui -t 99999 ${pname}.dsp @@ -19,7 +21,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ${pname} $out/bin/ + for f in $(find . -executable -type f); do + cp $f $out/bin/ + done mkdir -p $out/lib/lv2 cp -r ${pname}.lv2/ $out/lib/lv2 '';