From d0000eda465fb9bd596dc12338255463f34b346a Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Tue, 6 May 2025 11:57:32 +0000 Subject: [PATCH 1/2] freewheeling: cleanup --- pkgs/by-name/fr/freewheeling/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fr/freewheeling/package.nix b/pkgs/by-name/fr/freewheeling/package.nix index 039604733b563..05a7189d9004c 100644 --- a/pkgs/by-name/fr/freewheeling/package.nix +++ b/pkgs/by-name/fr/freewheeling/package.nix @@ -24,15 +24,15 @@ let makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freewheeling"; version = "0.6.6"; src = fetchFromGitHub { owner = "free-wheeling"; repo = "freewheeling"; - rev = "v${version}"; - sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4"; + tag = "v${finalAttrs.version}"; + hash = "sha256-xEZBE/7nUvK2hruqP6QQzlsIDmuniPZg7JEJkCEvzvU="; }; nativeBuildInputs = [ @@ -89,4 +89,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "fweelin"; }; -} +}) From 296779eaedc86a5bcdc2111f756d434599673706 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Tue, 6 May 2025 11:57:32 +0000 Subject: [PATCH 2/2] freewheeling: fix build --- pkgs/by-name/fr/freewheeling/package.nix | 30 ++++++------------------ 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/fr/freewheeling/package.nix b/pkgs/by-name/fr/freewheeling/package.nix index 05a7189d9004c..7d5c1f84ffa2a 100644 --- a/pkgs/by-name/fr/freewheeling/package.nix +++ b/pkgs/by-name/fr/freewheeling/package.nix @@ -3,8 +3,6 @@ stdenv, fetchFromGitHub, pkg-config, - autoreconfHook, - gnutls, freetype, fluidsynth, SDL, @@ -18,11 +16,9 @@ libSM, libsndfile, libogg, - libtool, + libX11, + nettle, }: -let - makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); -in stdenv.mkDerivation (finalAttrs: { pname = "freewheeling"; @@ -35,11 +31,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-xEZBE/7nUvK2hruqP6QQzlsIDmuniPZg7JEJkCEvzvU="; }; - nativeBuildInputs = [ - pkg-config - autoreconfHook - libtool - ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ freetype fluidsynth @@ -54,20 +47,11 @@ stdenv.mkDerivation (finalAttrs: { libsndfile libogg libSM - (gnutls.overrideAttrs (oldAttrs: { - configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; - })) + libX11 + nettle ]; - env.NIX_CFLAGS_COMPILE = toString ( - makeSDLFlags [ - SDL - SDL_ttf - SDL_gfx - ] - ++ [ "-I${libxml2.dev}/include/libxml2" ] - ); - hardeningDisable = [ "format" ]; + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev libxml2}/include/libxml2"; meta = { description = "Live looping instrument with JACK and MIDI support";