Unverified Commit 59176734 authored by Toma's avatar Toma Committed by GitHub
Browse files

{faust2,faustlive,faust2*}: move to pkgs/by-name (#407376)

parents e06158e5 bc6e5a46
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@
  fetchpatch,
}:

with lib.strings;

let

  version = "2.79.3";
@@ -170,7 +168,7 @@ let
        runHook preInstall

        mkdir -p "$out/bin"
        for script in ${concatStringsSep " " scripts}; do
        for script in ${lib.concatStringsSep " " scripts}; do
          cp "${dir}/$script" "$out/bin/"
        done

@@ -267,7 +265,7 @@ let

    let

      runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs));
      runtimePath = lib.concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs));

    in
    stdenv.mkDerivation (
+4 −4
Original line number Diff line number Diff line
{
  faust,
  alsa-lib,
  qtbase,
  qt5,
  writeText,
  buildPackages,
}:
@@ -14,7 +14,7 @@ let
      cd -- "$(dirname "$p")"
      binary=$(basename --suffix=.dsp "$p")
      rm -f .$binary-wrapped
      wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}"
      wrapProgram $binary --set QT_PLUGIN_PATH "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}"
      sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g'
      cd $workpath
    done
@@ -26,7 +26,7 @@ faust.wrapWithBuildEnv {

  propagatedBuildInputs = [
    alsa-lib
    qtbase
    qt5.qtbase
  ];

  dontWrapQtApps = true;
@@ -36,7 +36,7 @@ faust.wrapWithBuildEnv {
      # 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
      sed -i "/QMAKE=/c\ QMAKE="${qt5.qtbase.dev}/bin/qmake"" $script
    done
  '';
}
Loading