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

Audio updates #9273

Merged
merged 4 commits into from
Aug 19, 2015
Merged

Audio updates #9273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4beab22
ardour: simplify version handling
joelmo Aug 15, 2015
3d37dcc
ardour: 4.1 -> 4.2
joelmo Aug 15, 2015
e31e286
rkrlv2: initial version at beta
joelmo Aug 15, 2015
bf5eece
Make fetchFromGitHub return an additional attr rev
joelmo Aug 16, 2015
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
8 changes: 2 additions & 6 deletions pkgs/applications/audio/ardour/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ let
# "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.

# Version to build.
tag = "4.1";

# Version info that is built into the binary. Keep in sync with 'tag'. The
# last 8 digits is a (fake) commit id.
revision = "4.1-fe672c8";
tag = "4.2";

in

Expand All @@ -42,7 +38,7 @@ stdenv.mkDerivation rec {
];

patchPhase = ''
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc
Copy link
Member

Choose a reason for hiding this comment

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

Please note travis's error.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is fixed now with a modificaiton to fetchFromGitHub

sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
patchShebangs ./tools/
'';
Expand Down
24 changes: 24 additions & 0 deletions pkgs/applications/audio/rkrlv2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ stdenv, pkgs, fetchFromGitHub,
automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile
}:

stdenv.mkDerivation rec {
repo = "rkrlv2";
name = "${repo}-b1.0";

src = fetchFromGitHub {
owner = "ssj71";
inherit repo;
rev = "a315f5aefe63be7e34663596b8b050410a9b7e72";
sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8";
};

buildInputs = with xlibs; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];

meta = {
description = "Rakarrak effects ported to LV2";
homepage = https://github.com/ssj71/rkrlv2;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.joelmo ];
};
}
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ let
inherit name sha256;
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
meta.homepage = "https://github.com/${owner}/${repo}/";
};
} // { inherit rev; };

fetchFromBitbucket = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
inherit name sha256;
Expand Down Expand Up @@ -2850,6 +2850,8 @@ let

rkflashtool = callPackage ../tools/misc/rkflashtool { };

rkrlv2 = callPackage ../applications/audio/rkrlv2 {};

rmlint = callPackage ../tools/misc/rmlint {
inherit (pythonPackages) sphinx;
};
Expand Down