fileshare: fix build with GCC 14, misc. cleanup

+11 -4
+11 -4
pkgs/by-name/fi/fileshare/package.nix
··· 1 { 2 stdenv, 3 lib, 4 - fetchgit, 5 pkg-config, 6 git, 7 libmicrohttpd, ··· 11 pname = "fileshare"; 12 version = "0.2.4"; 13 14 - src = fetchgit { 15 - url = "https://git.tkolb.de/Public/fileshare.git"; 16 rev = "v${version}"; 17 - sha256 = "03jrhk4vj6bc2w3lsrfjpfflb4laihysgs5i4cv097nr5cz32hyk"; 18 }; 19 20 postPatch = '' 21 sed -i 's,$(shell git rev-parse --short HEAD),/${version},g' Makefile 22 ''; 23 24 nativeBuildInputs = [ 25 pkg-config
··· 1 { 2 stdenv, 3 lib, 4 + fetchFromGitea, 5 pkg-config, 6 git, 7 libmicrohttpd, ··· 11 pname = "fileshare"; 12 version = "0.2.4"; 13 14 + src = fetchFromGitea { 15 + domain = "git.tkolb.de"; 16 + owner = "Public"; 17 + repo = "fileshare"; 18 rev = "v${version}"; 19 + sha256 = "sha256-00MxPivZngQ2I7Hopz2MipJFnbvSZU0HF2wZucmEWQ4="; 20 }; 21 22 postPatch = '' 23 sed -i 's,$(shell git rev-parse --short HEAD),/${version},g' Makefile 24 + substituteInPlace Makefile \ 25 + --replace-fail pkg-config "${stdenv.cc.targetPrefix}pkg-config" \ 26 + --replace-fail gcc "${stdenv.cc.targetPrefix}cc" 27 ''; 28 + 29 + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; 30 31 nativeBuildInputs = [ 32 pkg-config