Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

faust: 2.0.a51 -> 2.1.0 #26633

Closed
wants to merge 1 commit into from
Closed

faust: 2.0.a51 -> 2.1.0 #26633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 10 additions & 8 deletions pkgs/applications/audio/faust/faust2.nix
View file
Open in desktop
@@ -1,6 +1,6 @@
{ stdenv
, coreutils
, fetchurl
, fetchFromGitHub
, makeWrapper
, pkgconfig
, clang
Expand All @@ -16,11 +16,13 @@ with stdenv.lib.strings;

let

version = "2.0.a51";
version = "2.1.0";

src = fetchurl {
url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz";
sha256 = "1yryjqfqmxs7lxy95hjgmrncvl9kig3rcsmg0v49ghzz7vs7haxf";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faust";
rev = "v${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "1pmiwy287g79ipz9pppnkfrdgls3l912kpkr7dfymk9wk5y5di9m";
};

meta = with stdenv.lib; {
Expand Down Expand Up @@ -67,7 +69,7 @@ let
#
# For now, fix this by 1) pinning the llvm version; 2) manually setting LLVM_VERSION
# to something the makefile will recognize.
sed '52iLLVM_VERSION=3.8.0' -i compiler/Makefile.unix
sed '52iLLVM_VERSION=${lib.getVersion llvm}' -i compiler/Makefile.unix
'';

# Remove most faust2appl scripts since they won't run properly
Expand Down Expand Up @@ -194,8 +196,8 @@ let
# export parts of the build environment
for script in "$out"/bin/*; do
wrapProgram "$script" \
--set FAUSTLIB "${faust}/lib/faust" \
--set FAUST_LIB_PATH "${faust}/lib/faust" \
--set FAUSTLIB "${faust}/share/faust" \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they moved their libraries to share?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idk: it stopped working after the update, and when I looked, the needed files where in this path...
Should I file that as a bug upstream?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I would bring it up and ask if this was intended or not.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I asked, and the answer was yes.

Copy link
Member

@FRidh FRidh Jun 16, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just built your PR ( you need stdenv.lib.getVersion) and saw it still keeps the shared libraries in lib so that is fine. I suppose FAUSTLIB affects the .lib files.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FAUSTLIB is mainly (afaik) for .cpp files that the compiler combines with the generated code to create the final product.

--set FAUST_LIB_PATH "${faust}/share/faust" \
--set FAUSTINC "${faust}/include/faust" \
--prefix PATH : "$PATH" \
--prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \
Expand Down