From ffbe5aff5723dcfe326054689d0754349ba4679a Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 14 Jan 2019 01:25:47 +0300 Subject: [PATCH] reaper: 5.961 -> 5.965 (#53880) --- pkgs/applications/audio/reaper/default.nix | 51 +++++++--------------- 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 749163893905..cabebb6f18e9 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -1,68 +1,47 @@ { stdenv, fetchurl, autoPatchelfHook, makeWrapper , alsaLib, xorg -, fetchFromGitHub, pkgconfig, gnome3 -, gnome2, gdk_pixbuf, cairo, glib, freetype -, libpulseaudio +, gnome3, pango, gdk_pixbuf, cairo, glib, freetype +, libpulseaudio, xdg_utils }: -let - libSwell = stdenv.mkDerivation { - name = "libSwell"; - - src = fetchFromGitHub { - owner = "justinfrankel"; - repo = "WDL"; - rev = "cb89dc81dc5cbc13a8f1b3cda38a204e356d4014"; - sha256 = "0m19dy4r0i21ckypzfhpfjm6sh00v9i088pva7hhhr4mmrbqd0ms"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnome3.gtk ]; - - buildPhase = '' - cd WDL/swell - make - ''; - - installPhase = '' - mv libSwell.so $out - ''; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "reaper-${version}"; - version = "5.961"; + version = "5.965"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "0lnpdnxnwn7zfn8slivkp971ll9qshgq7y9gcfrk5829z94df06i"; + sha256 = "05fn7r3v4qcb1b31g8layzvqilrwdr0s8yskr61yvbhx2dnjp9iw"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; buildInputs = [ alsaLib - stdenv.cc.cc.lib xorg.libX11 xorg.libXi - gnome3.gtk gdk_pixbuf - gnome2.pango + pango cairo glib freetype + + xdg_utils + ]; + + runtimeDependencies = [ + gnome3.gtk ]; dontBuild = true; installPhase = '' - ./install-reaper.sh --install $out/opt + XDG_DATA_HOME="$out/share" ./install-reaper.sh \ + --install $out/opt \ + --integrate-user-desktop rm $out/opt/REAPER/uninstall-reaper.sh - cp ${libSwell.out} $out/opt/REAPER/libSwell.so - wrapProgram $out/opt/REAPER/reaper \ --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib