From e727b2e847aa5db0fb2864e902faf863342d3711 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Wed, 16 Apr 2025 08:24:37 -0700 Subject: [PATCH 1/2] sooperlooper: 1.7.8 -> 1.7.9, unbreak --- pkgs/by-name/so/sooperlooper/package.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/so/sooperlooper/package.nix b/pkgs/by-name/so/sooperlooper/package.nix index 2dd184be7ecf..441793caec61 100644 --- a/pkgs/by-name/so/sooperlooper/package.nix +++ b/pkgs/by-name/so/sooperlooper/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoreconfHook, pkg-config, which, @@ -23,23 +22,15 @@ stdenv.mkDerivation rec { pname = "sooperlooper"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; rev = "v${version}"; - sha256 = "sha256-Lrsz/UDCgoac63FJ3CaPVaYwvBtzkGQQRLhUi6lUusE="; + sha256 = "sha256-bPu/VWTJLSIMoJSEQb+/nqtTpkPtCNVuXA17XsnFSP0="; }; - patches = [ - (fetchpatch { - name = "10-build_with_wx_32.patch"; - url = "https://sources.debian.org/data/main/s/sooperlooper/1.7.8~dfsg0-2/debian/patches/10-build_with_wx_32.patch"; - sha256 = "sha256-NF/w+zgRBNkSTqUJhfH9kQogXSYEF70pCN+loR0hjpg="; - }) - ]; - autoreconfPhase = '' patchShebangs ./autogen.sh ./autogen.sh @@ -67,6 +58,9 @@ stdenv.mkDerivation rec { fftw ]; + # see https://bugs.gentoo.org/925275 + CPPFLAGS = "-fpermissive"; + enableParallelBuilding = true; meta = with lib; { From 26886efec9bb7a9fe3e1235e5602b9bb172af50d Mon Sep 17 00:00:00 2001 From: awwpotato Date: Wed, 16 Apr 2025 08:25:23 -0700 Subject: [PATCH 2/2] sooperlooper: moderinize --- pkgs/by-name/so/sooperlooper/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/so/sooperlooper/package.nix b/pkgs/by-name/so/sooperlooper/package.nix index 441793caec61..c849da803959 100644 --- a/pkgs/by-name/so/sooperlooper/package.nix +++ b/pkgs/by-name/so/sooperlooper/package.nix @@ -20,14 +20,14 @@ fftw, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sooperlooper"; version = "1.7.9"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-bPu/VWTJLSIMoJSEQb+/nqtTpkPtCNVuXA17XsnFSP0="; }; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Live looping sampler capable of immediate loop recording, overdubbing, multiplying, reversing and more"; longDescription = '' It allows for multiple simultaneous multi-channel loops limited only by your computer's available memory. @@ -73,8 +73,9 @@ stdenv.mkDerivation rec { and the engine can be run standalone on a computer without a monitor. ''; homepage = "https://sonosaurus.com/sooperlooper/"; - license = licenses.gpl2; - maintainers = with maintainers; [ magnetophon ]; - platforms = platforms.linux; + downloadPage = "https://github.com/essej/sooperlooper"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ magnetophon ]; + platforms = lib.platforms.linux; }; -} +})