From 2c87ea374c3818ddd1945a1da671a004f2881b4c Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 10 Dec 2024 01:00:45 +0800 Subject: [PATCH 1/2] tonelib-metal: format --- pkgs/by-name/to/tonelib-metal/package.nix | 46 ++++++++++++----------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/to/tonelib-metal/package.nix b/pkgs/by-name/to/tonelib-metal/package.nix index f337e59c2274..6ada9248e7df 100644 --- a/pkgs/by-name/to/tonelib-metal/package.nix +++ b/pkgs/by-name/to/tonelib-metal/package.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, dpkg -, alsa-lib -, freetype -, libglvnd -, mesa -, curl -, libXcursor -, libXinerama -, libXrandr -, libXrender -, libjack2 +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + dpkg, + alsa-lib, + freetype, + libglvnd, + mesa, + curl, + libXcursor, + libXinerama, + libXrandr, + libXrender, + libjack2, }: stdenv.mkDerivation rec { @@ -24,7 +25,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-G80EKAsXomdk8GsnNyvjN8shz3YMKhqdWWYyVB7xTsU="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg ]; + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; buildInputs = [ (lib.getLib stdenv.cc.cc) @@ -48,14 +52,14 @@ stdenv.mkDerivation rec { installPhase = '' mv usr $out substituteInPlace $out/share/applications/ToneLib-Metal.desktop --replace /usr/ $out/ - ''; + ''; - meta = with lib; { + meta = { description = "ToneLib Metal – Guitar amp simulator targeted at metal players"; homepage = "https://tonelib.net/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ dan4ik605743 ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; mainProgram = "ToneLib-Metal"; }; From 75c8475e45600ff31d86b222696e5f78ed1f2c02 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 10 Dec 2024 01:17:11 +0800 Subject: [PATCH 2/2] tonelib-metal: 1.2.6 -> 1.3.0 --- pkgs/by-name/to/tonelib-metal/package.nix | 34 ++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/to/tonelib-metal/package.nix b/pkgs/by-name/to/tonelib-metal/package.nix index 6ada9248e7df..1286400c8bfe 100644 --- a/pkgs/by-name/to/tonelib-metal/package.nix +++ b/pkgs/by-name/to/tonelib-metal/package.nix @@ -15,14 +15,13 @@ libXrender, libjack2, }: - stdenv.mkDerivation rec { pname = "tonelib-metal"; - version = "1.2.6"; + version = "1.3.0"; src = fetchurl { - url = "https://tonelib.net/download/221222/ToneLib-Metal-amd64.deb"; - sha256 = "sha256-G80EKAsXomdk8GsnNyvjN8shz3YMKhqdWWYyVB7xTsU="; + url = "https://tonelib.vip/download/24-10-24/ToneLib-Metal-amd64.deb"; + hash = "sha256-H19ZUOFI7prQJPo9NWWAHSOwpZ4RIbpRJHfQVjDp/VA="; }; nativeBuildInputs = [ @@ -30,14 +29,6 @@ stdenv.mkDerivation rec { dpkg ]; - buildInputs = [ - (lib.getLib stdenv.cc.cc) - alsa-lib - freetype - libglvnd - mesa - ] ++ runtimeDependencies; - runtimeDependencies = map lib.getLib [ curl libXcursor @@ -47,16 +38,27 @@ stdenv.mkDerivation rec { libjack2 ]; - unpackCmd = "dpkg -x $curSrc source"; + buildInputs = [ + (lib.getLib stdenv.cc.cc) + alsa-lib + freetype + libglvnd + mesa + ] ++ runtimeDependencies; installPhase = '' - mv usr $out - substituteInPlace $out/share/applications/ToneLib-Metal.desktop --replace /usr/ $out/ + runHook preInstall + + cp -r usr $out + substituteInPlace $out/share/applications/ToneLib-Metal.desktop \ + --replace-fail "/usr/" "$out/" + + runHook postInstall ''; meta = { description = "ToneLib Metal – Guitar amp simulator targeted at metal players"; - homepage = "https://tonelib.net/"; + homepage = "https://tonelib.net"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ dan4ik605743 ];