public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93633 from magnetophon/faust

Browse Source 
faust: unstable-2020-06-08 -> unstable-2020-08-03
This commit is contained in:
Orivej Desh (NixOS) 2020-08-16 18:42:27 +00:00 committed by GitHub
commit 9e2c0f51f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/audio/faust/faust2.nix
View File

@ -5,7 +5,8 @@
, pkgconfig , pkgconfig
, cmake , cmake
, llvm , llvm
, emscripten # TODO: put back when it builds again
# , emscripten
, openssl , openssl
, libsndfile , libsndfile
, libmicrohttpd , libmicrohttpd
@ -20,13 +21,13 @@ with stdenv.lib.strings;
let let
version = "unstable-2020-06-08"; version = "unstable-2020-08-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grame-cncm"; owner = "grame-cncm";
repo = "faust"; repo = "faust";
rev = "f0037e289987818b65d3f6fb1ad943aaad2a2b28"; rev = "b6045f4592384076d3b383d116e602a95a000eb3";
sha256 = "0h08902rgx7rhzpng4h1qw8i2nzv50f79vrlbzdk5d35wa4zibh4"; sha256 = "1wcpilwnkc7rrbv9gbkj5hb7kamkh8nrc3r4hbcvbz5ar2pfc6d5";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -46,7 +47,7 @@ let
inherit src; inherit src;
nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ]; nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ];
buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; buildInputs = [ llvm /*emscripten*/ openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ];
passthru = { passthru = {

22
pkgs/applications/audio/faust/faustlive.nix
View File

@ -1,26 +1,34 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, llvm, qt48Full, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl , llvm, qt48Full, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl
, bc, coreutils, which , bc, coreutils, which, libsndfile, pkg-config
}: }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "faustlive"; pname = "faustlive";
version = "2017-12-05"; version = "2.5.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grame-cncm"; owner = "grame-cncm";
repo = "faustlive"; repo = "faustlive";
rev = "281fcb852dcd94f8c57ade1b2a7a3937542e1b2d"; rev = version;
sha256 = "0sw44yd9928rid9ib0b5mx2x129m7zljrayfm6jz6hrwdc5q3k9a"; sha256 = "0npn8fvq8iafyamq4wrj1k1bmk4xd0my2sp3gi5jdjfx6hc1sm3n";
fetchSubmodules = true;
}; };
buildInputs = [ buildInputs = [
llvm qt48Full qrencode libmicrohttpd libjack2 alsaLib faust curl llvm qt48Full qrencode libmicrohttpd libjack2 alsaLib faust curl
bc coreutils which bc coreutils which libsndfile pkg-config
]; ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
preBuild = "patchShebangs Build/Linux/buildversion"; postPatch = "cd Build";
installPhase = ''
install -d "$out/bin"
install -d "$out/share/applications"
install FaustLive/FaustLive "$out/bin"
install rsrc/FaustLive.desktop "$out/share/applications"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A standalone just-in-time Faust compiler"; description = "A standalone just-in-time Faust compiler";