From 1c09a32d85120e74064e3a5873413c56357f2b79 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Wed, 27 Oct 2021 19:06:18 +0700 Subject: [PATCH] tonelib-jam: 4.6.6 -> 4.7.0 --- .../audio/tonelib-jam/default.nix | 70 +++++++++---------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index 7a5a5c7280fa..54ed7a977f39 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -1,60 +1,56 @@ -{ stdenv -, dpkg -, lib -, autoPatchelfHook +{ lib +, stdenv , fetchurl -, gtk3 -, glib -, desktop-file-utils +, autoPatchelfHook +, dpkg , alsa-lib -, libjack2 -, harfbuzz -, fribidi -, pango , freetype +, libglvnd , curl +, libXcursor +, libXinerama +, libXrandr +, libXrender +, libjack2 }: stdenv.mkDerivation rec { pname = "tonelib-jam"; - version = "4.6.6"; + version = "4.7.0"; src = fetchurl { - url = "https://www.tonelib.net/download/0509/ToneLib-Jam-amd64.deb"; - sha256 = "sha256-cizIQgO35CQSLme/LKQqP+WzB/jCTk+fS5Z+EtF7wnQ="; + url = "https://www.tonelib.net/download/0930/ToneLib-Jam-amd64.deb"; + sha256 = "sha256-xyBDp3DQVC+nK2WGnvrfUfD+9GvwtbldXgExTMmCGw0="; }; - buildInputs = [ - dpkg - gtk3 - glib - desktop-file-utils - alsa-lib - libjack2 - harfbuzz - fribidi - pango - freetype - ]; - nativeBuildInputs = [ autoPatchelfHook + dpkg ]; - unpackPhase = '' - mkdir -p $TMP/ $out/ - dpkg -x $src $TMP - ''; + buildInputs = [ + stdenv.cc.cc.lib + alsa-lib + freetype + libglvnd + ] ++ runtimeDependencies; + + runtimeDependencies = map lib.getLib [ + curl + libXcursor + libXinerama + libXrandr + libXrender + libjack2 + ]; + + unpackCmd = "dpkg -x $curSrc source"; installPhase = '' - cp -R $TMP/usr/* $out/ - mv $out/bin/ToneLib-Jam $out/bin/tonelib-jam + mv usr $out + substituteInPlace $out/share/applications/ToneLib-Jam.desktop --replace /usr/ $out/ ''; - runtimeDependencies = [ - (lib.getLib curl) - ]; - meta = with lib; { description = "ToneLib Jam – the learning and practice software for guitar players"; homepage = "https://tonelib.net/";