Skip to content

freewheeling: fix build #404620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
risicle merged 2 commits into from
May 8, 2025
Merged

freewheeling: fix build #404620

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0000ed
freewheeling: cleanup
mjoerg May 6, 2025
296779e
freewheeling: fix build
mjoerg May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 11 additions & 27 deletions pkgs/by-name/fr/freewheeling/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
stdenv,
fetchFromGitHub,
pkg-config,
autoreconfHook,
gnutls,
freetype,
fluidsynth,
SDL,
Expand All @@ -18,28 +16,23 @@
libSM,
libsndfile,
libogg,
libtool,
libX11,
nettle,
}:
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 = [
pkg-config
autoreconfHook
libtool
];
nativeBuildInputs = [ pkg-config ];

buildInputs = [
freetype
fluidsynth
Expand All @@ -54,20 +47,11 @@ stdenv.mkDerivation rec {
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
Copy link
Contributor

@risicle risicle May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were these possibly needed in a previous version and just never removed? Same with some other dependencies you appear to have been able to just remove..

Copy link
Contributor

@LordGrimmauld LordGrimmauld May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These dependencies still exist, but are now being located by pkg-config.
Afaict, only gnutls was actually unused.

Copy link
Contributor Author

@mjoerg mjoerg May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These dependencies still exist, but are now being located by pkg-config. Afaict, only gnutls was actually unused.

Correct. gnutls was swapped against nettle upstream, which still was working since nettle is a dependency of gnutls.

]
++ [ "-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";
Expand All @@ -89,4 +73,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux;
mainProgram = "fweelin";
};
}
})