From 93262df2270083d9b4e04e0bddd1e48e304d4a47 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 3 Jan 2025 11:24:34 +0100 Subject: [PATCH] fileshare: fix build with GCC 14, misc. cleanup --- pkgs/by-name/fi/fileshare/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fi/fileshare/package.nix b/pkgs/by-name/fi/fileshare/package.nix index 0389ebd0c54f..dc8401f8139a 100644 --- a/pkgs/by-name/fi/fileshare/package.nix +++ b/pkgs/by-name/fi/fileshare/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchgit, + fetchFromGitea, pkg-config, git, libmicrohttpd, @@ -11,16 +11,23 @@ stdenv.mkDerivation rec { pname = "fileshare"; version = "0.2.4"; - src = fetchgit { - url = "https://git.tkolb.de/Public/fileshare.git"; + src = fetchFromGitea { + domain = "git.tkolb.de"; + owner = "Public"; + repo = "fileshare"; rev = "v${version}"; - sha256 = "03jrhk4vj6bc2w3lsrfjpfflb4laihysgs5i4cv097nr5cz32hyk"; + sha256 = "sha256-00MxPivZngQ2I7Hopz2MipJFnbvSZU0HF2wZucmEWQ4="; }; postPatch = '' sed -i 's,$(shell git rev-parse --short HEAD),/${version},g' Makefile + substituteInPlace Makefile \ + --replace-fail pkg-config "${stdenv.cc.targetPrefix}pkg-config" \ + --replace-fail gcc "${stdenv.cc.targetPrefix}cc" ''; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + nativeBuildInputs = [ pkg-config git