Unverified Commit 52980ff9 authored by Aaron Jheng's avatar Aaron Jheng
Browse files

gnumeric: fix build for unkown bool error

parent a35ab764

pkgs/by-name/gn/gnumeric/package.nix

+15 −6
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  fetchpatch,

  pkg-config,

  intltool,

  libxml2,
@@ -37,6 +37,20 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-fv4RlIfJiLY3MbsAsgRgJ010/Ob1X1be29XfoweCMpI=";

  };



  patches = [

    # Replace bool type with gboolean.

    # See https://gitlab.gnome.org/GNOME/gnumeric/-/merge_requests/39.

    (fetchpatch {

      url = "https://gitlab.gnome.org/GNOME/gnumeric/-/commit/dee6523426b75c10c36b188fafe6e7a27b6631e3.patch";

      hash = "sha256-a4KgxsrU9m/dZqu2LNC+jWiXvCTcRPzZW/67pg8yLGY=";

    })

  ];



  postPatch = ''

    substituteInPlace configure.ac \

      --replace-fail 'GLIB_COMPILE_RESOURCES=' 'GLIB_COMPILE_RESOURCES="glib-compile-resources"#'

  '';



  preConfigure = ''

    ./autogen.sh

  '';
@@ -74,11 +88,6 @@ stdenv.mkDerivation (finalAttrs: { 


  enableParallelBuilding = true;



  postPatch = ''

    substituteInPlace configure.ac \

      --replace-fail 'GLIB_COMPILE_RESOURCES=' 'GLIB_COMPILE_RESOURCES="glib-compile-resources"#'

  '';



  passthru = {

    updateScript = gnome.updateScript {

      packageName = "gnumeric";