diff options
| author | Felix Albrigtsen <felix@albrigtsen.it> | 2024-01-30 22:20:54 +0100 |
|---|---|---|
| committer | Felix Albrigtsen <felix@albrigtsen.it> | 2024-02-15 10:56:28 +0100 |
| commit | 4c947c7337440843ba521c266277a161286e26a4 (patch) | |
| tree | e46ad899f4d5228825048cf758dc2d4a8474ee83 /pkgs/applications/networking/browsers/netsurf/browser.nix | |
| parent | 6777670fca9e13030f035d0f72b5b10ffadbf36b (diff) | |
netsurf.browser: 3.10 -> 3.11, fix build on darwin
https://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt
Diffstat (limited to 'pkgs/applications/networking/browsers/netsurf/browser.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/netsurf/browser.nix | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix index d9df75b00c2ba..0297301096d63 100644 --- a/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -5,12 +5,14 @@ , check , curl , expat +, gperf , gtk2 , gtk3 , libXcursor , libXrandr , libidn , libjpeg +, libjxl , libpng , libwebp , libxml2 @@ -44,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netsurf"; - version = "3.10"; + version = "3.11"; src = fetchurl { url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4="; + hash = "sha256-wopiau/uQo0FOxP4i1xECSIkWXZSLRLq8TfP0y0gHLI="; }; nativeBuildInputs = [ @@ -63,10 +65,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ check curl + gperf libXcursor libXrandr libidn libjpeg + libjxl libpng libwebp libxml2 @@ -103,8 +107,20 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + + patchPhase = lib.optionalString stdenv.cc.isClang '' + runHook prePatch + + substituteInPlace Makefile \ + --replace-warn '--trace' '-t' \ + --replace-warn '-Wimplicit-fallthrough=3' '-Wimplicit-fallthrough' + + runHook postPatch + ''; + preConfigure = '' - cat <<EOF > Makefile.conf + cat <<EOF > Makefile.config override NETSURF_GTK_RES_PATH := $out/share/ override NETSURF_USE_GRESOURCE := YES EOF |