Merge pull request #215561 from magnetophon/faust_QT5

faust: replace qt4 with qt5

pkgs/applications/audio/faust/faust2alqt.nix

···
 { faust
 , alsa-lib
-, qt4
+, qtbase
+, writeText
+, makeWrapper
 }:
-
+let
+  # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH
+  wrapBinary = writeText "wrapBinary" ''
+    source ${makeWrapper}/nix-support/setup-hook
+    for p in $FILES; do
+      workpath=$PWD
+      cd -- "$(dirname "$p")"
+      binary=$(basename --suffix=.dsp "$p")
+      rm -f .$binary-wrapped
+      wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}"
+      sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g'
+      cd $workpath
+    done
+  '';
+in
 faust.wrapWithBuildEnv {
 
   baseName = "faust2alqt";
 
   propagatedBuildInputs = [
     alsa-lib
-    qt4
+    qtbase
   ];
 
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    for script in "$out"/bin/*; do
+      # append the wrapping code to the compilation script
+      cat ${wrapBinary} >> $script
+      # prevent the qmake error when running the script
+      sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" $script
+    done
+  '';
 }

pkgs/applications/audio/faust/faust2jaqt.nix

···
 { faust
 , jack2
-, qt4
+, qtbase
 , libsndfile
 , alsa-lib
+, writeText
+, makeWrapper
 , which
 }:
-
+let
+  # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH
+  wrapBinary = writeText "wrapBinary" ''
+    source ${makeWrapper}/nix-support/setup-hook
+    for p in $FILES; do
+      workpath=$PWD
+      cd -- "$(dirname "$p")"
+      binary=$(basename --suffix=.dsp "$p")
+      rm -f .$binary-wrapped
+      wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}"
+      sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g'
+      cd $workpath
+    done
+  '';
+in
 faust.wrapWithBuildEnv {
 
   baseName = "faust2jaqt";
···
 
   propagatedBuildInputs = [
     jack2
-    qt4
+    qtbase
     libsndfile
     alsa-lib
     which
   ];
 
+
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    for script in "$out"/bin/*; do
+      # append the wrapping code to the compilation script
+      cat ${wrapBinary} >> $script
+      # prevent the qmake error when running the script
+      sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" $script
+    done
+  '';
 }

pkgs/applications/audio/faust/faust2lv2.nix

···
 { boost
 , faust
 , lv2
-, qt4
+, qtbase
 , which
-
 }:
 
 faust.wrapWithBuildEnv {
 
   baseName = "faust2lv2";
 
-  propagatedBuildInputs = [ boost lv2 qt4 which ];
+  propagatedBuildInputs = [ boost lv2 qtbase ];
 
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" "$out"/bin/faust2lv2;
+  '';
 }

pkgs/applications/audio/faustPhysicalModeling/default.nix

···
 
   buildInputs = [ faust2jaqt faust2lv2 ];
 
+  dontWrapQtApps = true;
+
   buildPhase = ''
     cd examples/physicalModeling
 

pkgs/applications/audio/faustStk/default.nix

···
-{ stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }:
-
-stdenv.mkDerivation rec {
-  pname = "faustPhhysicalModeling";
-  version = "2.20.2";
-
-  src = fetchFromGitHub {
-    owner = "grame-cncm";
-    repo = "faust";
-    rev = version;
-    sha256 = "1mm93ba26b7q69hvabzalg30dh8pl858nj4m2bb57pznnp09lq9a";
-  };
-
-  buildInputs = [ faust2jaqt faust2lv2 ];
-
-  buildPhase = ''
-    cd examples/physicalModeling/faust-stk
-
-    for f in *.dsp; do
-      faust2jaqt -time -vec  -midi -nvoices 8 -t 99999 $f
-      faust2lv2  -time -vec -double -gui -nvoices 32 -t 99999 $f
-    done
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib/lv2 $out/bin
-    mv *.lv2/ $out/lib/lv2
-    for f in $(find . -executable -type f); do
-      cp $f $out/bin/
-    done
-  '';
-  meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64);
-    description = "The physical modeling instruments included with faust, compiled as jack standalone and lv2 instruments";
-    homepage = "https://ccrma.stanford.edu/~rmichon/faustSTK/";
-    license = licenses.stk;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ magnetophon ];
-  };
-}

pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix

···
 
   buildInputs = [ faust2jaqt faust2lv2 ];
 
+  dontWrapQtApps = true;
+
   buildPhase = ''
     faust2jaqt -vec -time -t 99999 CharacterCompressor.dsp
     faust2jaqt -vec -time -t 99999 CharacterCompressorMono.dsp
···
 
   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

pkgs/applications/audio/magnetophonDSP/CompBus/default.nix

···
 
   buildInputs = [ faust2jaqt faust2lv2 ];
 
+  dontWrapQtApps = true;
+
   buildPhase = ''
     for f in *.dsp;
     do
···
     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
   '';

pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix

···
 
   buildInputs = [ faust2jaqt faust2lv2 ];
 
+  dontWrapQtApps = true;
+
   buildPhase = ''
     faust2jaqt -time -vec -t 99999 ConstantDetuneChorus.dsp
     faust2lv2  -time -vec -t 99999 -gui ConstantDetuneChorus.dsp
···
 
   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
   '';
···
     homepage = "https://github.com/magnetophon/constant-detune-chorus";
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.magnetophon ];
+    # ERROR3 : n is NaN in an Interval
+    broken = true;
   };
 }

pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix

···
 
   buildInputs = [ faust2jaqt faust2lv2 ];
 
+  dontWrapQtApps = true;
+
   buildPhase = ''
     faust2jaqt -vec -time -t 99999 LazyLimiter.dsp
     faust2lv2 -vec -time -t 99999  -gui LazyLimiter.dsp
···
 
   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
   '';

pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix

···
 
   buildInputs = [ faust2jaqt faust2lv2 ];
 
+  dontWrapQtApps = true;
+
   buildPhase = ''
     faust2jaqt -time -vec -t 99999 MBdistortion.dsp
     faust2lv2 -time -vec -gui -t 99999 MBdistortion.dsp
···
 
   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
   '';

pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix

···
 
   buildInputs = [ faust2jaqt faust2lv2 ];
 
+  dontWrapQtApps = true;
+
   buildPhase = ''
     faust2jaqt -time -vec -t 99999 RhythmDelay.dsp
     faust2lv2  -time -vec -t 99999 -gui RhythmDelay.dsp
···
 
   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
   '';

pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix

···
 
   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
···
   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/

pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix

···
 
   buildInputs = [ faust2jaqt faust2lv2 ];
 
+  dontWrapQtApps = true;
+
   buildPhase = ''
     echo "hack out autoComp.dsp due to https://github.com/grame-cncm/faust/407/issues "
     rm autoComp.dsp
···
     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
   '';

pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix

···
 
   buildInputs = [ faust2jaqt faust2lv2 ];
 
+  dontWrapQtApps = true;
+
   buildPhase = ''
     for f in *.dsp
       do
···
     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";

pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix

···
 
   buildInputs = [ faust2jaqt faust2lv2 ];
 
+  dontWrapQtApps = true;
+
   buildPhase = ''
     faust2jaqt -vec -double -time -t 99999 shelfMultiBand.dsp
     faust2jaqt -vec -double -time -t 99999 shelfMultiBandMono.dsp
···
 
   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

pkgs/applications/audio/mooSpace/default.nix

···
 
   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
···
 
   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 = {

pkgs/applications/audio/tambura/default.nix

···
 
   buildInputs = [ faust2jaqt faust2lv2 ];
 
+  dontWrapQtApps = true;
+
   buildPhase = ''
     faust2jaqt -vec -time -t 99999 ${pname}.dsp
     faust2lv2 -vec -time -gui -t 99999 ${pname}.dsp
···
 
   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
   '';

pkgs/top-level/aliases.nix

···
   ### F ###
 
   facette = throw "facette has been removed"; # Added 2020-01-06
+  faustStk = faustPhysicalModeling; # Added 2023-05-16
   fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
   fastnlo = fastnlo_toolkit; # Added 2021-04-24
   fbreader = throw "fbreader has been removed, as the upstream project has been archived"; # Added 2022-05-26

pkgs/top-level/all-packages.nix

···
 
   faust2 = callPackage ../applications/audio/faust/faust2.nix { };
 
-  faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { };
+  faust2alqt = libsForQt5.callPackage ../applications/audio/faust/faust2alqt.nix { };
 
   faust2alsa = callPackage ../applications/audio/faust/faust2alsa.nix { };
 
···
 
   faust2jackrust = callPackage ../applications/audio/faust/faust2jackrust.nix { };
 
-  faust2jaqt = callPackage ../applications/audio/faust/faust2jaqt.nix { };
+  faust2jaqt = libsForQt5.callPackage ../applications/audio/faust/faust2jaqt.nix { };
 
   faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { };
 
-  faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { };
+  faust2lv2 = libsForQt5.callPackage ../applications/audio/faust/faust2lv2.nix { };
 
   faustlive = callPackage ../applications/audio/faust/faustlive.nix { };
 
   faustPhysicalModeling = callPackage ../applications/audio/faustPhysicalModeling  { };
-
-  faustStk = callPackage ../applications/audio/faustStk  { };
 
   flockit = callPackage ../tools/backup/flockit { };