about summary refs log tree commit diff
path: root/pkgs/applications/audio
diff options
context:
space:
mode:
authorJonas Heinrich <onny@project-insanity.org>2022-09-03 09:35:03 +0200
committerGitHub <noreply@github.com>2022-09-03 09:35:03 +0200
commit0b4772d28439ec29c6f1de71d4c8c50c7b4dbee1 (patch)
tree40c55e21e02cb60c7d4ed44467352c27ccb93303 /pkgs/applications/audio
parentddb580ded39050d90c6f6818fc365958dc74305a (diff)
parentceb6f3d6a42cd9b00782e9c3eaa5afe759d79f6f (diff)
downloadnixlib-0b4772d28439ec29c6f1de71d4c8c50c7b4dbee1.tar
nixlib-0b4772d28439ec29c6f1de71d4c8c50c7b4dbee1.tar.gz
nixlib-0b4772d28439ec29c6f1de71d4c8c50c7b4dbee1.tar.bz2
nixlib-0b4772d28439ec29c6f1de71d4c8c50c7b4dbee1.tar.lz
nixlib-0b4772d28439ec29c6f1de71d4c8c50c7b4dbee1.tar.xz
nixlib-0b4772d28439ec29c6f1de71d4c8c50c7b4dbee1.tar.zst
nixlib-0b4772d28439ec29c6f1de71d4c8c50c7b4dbee1.zip
Merge pull request #189238 from rantlivelintkale/fix/guitarix-update
guitarix: 0.42.1 -> 0.44.1
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r--pkgs/applications/audio/guitarix/default.nix19
1 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 724280fbcdd5..870f4b216f51 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -6,6 +6,7 @@
 , boost
 , curl
 , eigen
+, faust
 , fftw
 , gettext
 , glib
@@ -42,22 +43,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "guitarix";
-  version = "0.42.1";
+  version = "0.44.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
-    sha256 = "101c2hdpipj3s6rmva5wf3q9hfjv7bkyzi7s8sgaiys8f7h4czkr";
+    sha256 = "d+g9dU9RrDjFQj847rVd5bPiYSjmC1EbAtLe/PNubBg=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "guitarix-gcc11.patch";
-      url = "https://github.com/brummer10/guitarix/commit/d8f003484c57d808682025dfb07a7a1fb848afdc.patch";
-      stripLen = 1;
-      sha256 = "1qhlbf18cn6m9jdz3741nrdfqvznjna3daqmn9l10k5nd3asy4il";
-    })
-  ];
-
   nativeBuildInputs = [
     gettext
     hicolor-icon-theme
@@ -74,6 +66,7 @@ stdenv.mkDerivation rec {
     boost
     curl
     eigen
+    faust
     fftw
     glib
     glib-networking.out
@@ -96,11 +89,7 @@ stdenv.mkDerivation rec {
     zita-resampler
   ];
 
-  # this doesnt build, probably because we have the wrong faust version:
-  #       "--faust"
-  # aproved versions are 2.20.2 and 2.15.11
   wafConfigureFlags = [
-    "--no-faust"
     "--no-font-cache-update"
     "--shared-lib"
     "--no-desktop-update"