Merge pull request #143142 from dan4ik605743/tonelib-up

authored by

Sandro and committed by
GitHub
a3cf666f e072c764

+31 -35
+31 -35
pkgs/applications/audio/tonelib-jam/default.nix
··· 1 - { stdenv 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , autoPatchelfHook 2 5 , dpkg 3 - , lib 4 - , autoPatchelfHook 5 - , fetchurl 6 - , gtk3 7 - , glib 8 - , desktop-file-utils 9 6 , alsa-lib 10 - , libjack2 11 - , harfbuzz 12 - , fribidi 13 - , pango 14 7 , freetype 8 + , libglvnd 15 9 , curl 10 + , libXcursor 11 + , libXinerama 12 + , libXrandr 13 + , libXrender 14 + , libjack2 16 15 }: 17 16 18 17 stdenv.mkDerivation rec { 19 18 pname = "tonelib-jam"; 20 - version = "4.6.6"; 19 + version = "4.7.0"; 21 20 22 21 src = fetchurl { 23 - url = "https://www.tonelib.net/download/0509/ToneLib-Jam-amd64.deb"; 24 - sha256 = "sha256-cizIQgO35CQSLme/LKQqP+WzB/jCTk+fS5Z+EtF7wnQ="; 22 + url = "https://www.tonelib.net/download/0930/ToneLib-Jam-amd64.deb"; 23 + sha256 = "sha256-xyBDp3DQVC+nK2WGnvrfUfD+9GvwtbldXgExTMmCGw0="; 25 24 }; 26 25 27 - buildInputs = [ 26 + nativeBuildInputs = [ 27 + autoPatchelfHook 28 28 dpkg 29 - gtk3 30 - glib 31 - desktop-file-utils 29 + ]; 30 + 31 + buildInputs = [ 32 + stdenv.cc.cc.lib 32 33 alsa-lib 33 - libjack2 34 - harfbuzz 35 - fribidi 36 - pango 37 34 freetype 38 - ]; 35 + libglvnd 36 + ] ++ runtimeDependencies; 39 37 40 - nativeBuildInputs = [ 41 - autoPatchelfHook 38 + runtimeDependencies = map lib.getLib [ 39 + curl 40 + libXcursor 41 + libXinerama 42 + libXrandr 43 + libXrender 44 + libjack2 42 45 ]; 43 46 44 - unpackPhase = '' 45 - mkdir -p $TMP/ $out/ 46 - dpkg -x $src $TMP 47 - ''; 47 + unpackCmd = "dpkg -x $curSrc source"; 48 48 49 49 installPhase = '' 50 - cp -R $TMP/usr/* $out/ 51 - mv $out/bin/ToneLib-Jam $out/bin/tonelib-jam 50 + mv usr $out 51 + substituteInPlace $out/share/applications/ToneLib-Jam.desktop --replace /usr/ $out/ 52 52 ''; 53 - 54 - runtimeDependencies = [ 55 - (lib.getLib curl) 56 - ]; 57 53 58 54 meta = with lib; { 59 55 description = "ToneLib Jam – the learning and practice software for guitar players";