diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-27 17:44:08 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-27 17:44:08 +0200 |
commit | b22cc53db147cdbfe84ffbc344143bf1e8c1e515 (patch) | |
tree | d17f8e64fd312018c710405c48ee5d25a035dbd5 /pkgs/applications/audio | |
parent | d90eea8cff60490249a614813a76ddd8afa517f8 (diff) | |
parent | dac633fc37bf8a699e81747cc819b78be4426ae5 (diff) | |
download | nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.tar nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.tar.gz nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.tar.bz2 nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.tar.lz nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.tar.xz nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.tar.zst nixlib-b22cc53db147cdbfe84ffbc344143bf1e8c1e515.zip |
Merge staging into master
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/easytag/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/renoise/default.nix | 26 |
2 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index e3263c944f45..f3bcff7a2c51 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -22,6 +22,8 @@ in stdenv.mkDerivation rec { gsettings-desktop-schemas gnome3.defaultIconTheme ]; + doCheck = false; # fails 1 out of 9 tests + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index d02c551be8af..5ec7375056ec 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }: +{ stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }: + +with stdenv.lib; # To use the full release version: # 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version @@ -6,31 +8,35 @@ # 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. # Note: Renoise creates an individual build for each license which screws somewhat with the # use of functions like requireFile as the hash will be different for every user. -let fileversion = "3_1_0"; +let + urlVersion = replaceStrings [ "." ] [ "_" ]; in + stdenv.mkDerivation rec { - name = "renoise"; - buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; + name = "renoise-${version}"; + version = "3.1.0"; src = if stdenv.system == "x86_64-linux" then if builtins.isNull releasePath then fetchurl { - url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86_64.tar.bz2"; - sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; + url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2"; + sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; } else releasePath else if stdenv.system == "i686-linux" then if builtins.isNull releasePath then fetchurl { - url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86.tar.bz2"; - sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; + url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2"; + sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; } else releasePath else throw "Platform is not supported by Renoise"; + buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; + installPhase = '' cp -r Resources $out @@ -55,6 +61,8 @@ stdenv.mkDerivation rec { meta = { description = "Modern tracker-based DAW"; homepage = http://www.renoise.com/; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; + maintainers = []; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } |