From b2c5490fdfdc6127d212e2c9890fd51a6e6824ed Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 30 Oct 2022 01:58:29 +0200 Subject: [PATCH] flamerobin: 0.9.3.1 -> 0.9.3.12 --- pkgs/applications/misc/flamerobin/default.nix | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix index 8178288ba56..5fd805994a6 100644 --- a/pkgs/applications/misc/flamerobin/default.nix +++ b/pkgs/applications/misc/flamerobin/default.nix @@ -1,26 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, wxGTK30, boost, firebird }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, wxGTK32 +, boost +, firebird +}: stdenv.mkDerivation rec { - version = "0.9.3.1"; + version = "0.9.3.12"; pname = "flamerobin"; src = fetchFromGitHub { owner = "mariuz"; repo = "flamerobin"; rev = version; - sha256 = "1wwcsca01hpgi9z5flvbdhs9zv7jvahnbn97j6ymy0hdyb8lv6si"; + sha256 = "sha256-uWx3riRc79VKh7qniWFjxxc7v6l6cW0i31HxoN1BSdA="; }; + patches = [ + # rely on compiler command line for __int128 and std::decimal::decimal128 + (fetchpatch { + url = "https://github.com/mariuz/flamerobin/commit/8e0ea6d42aa28a4baeaa8c8b8b57c56eb9ae3540.patch"; + sha256 = "sha256-l6LWXA/sRQGQKi798bzl0iIJ2vdvXHOjG7wdFSXv+NM="; + }) + ]; + enableParallelBuilding = true; - buildInputs = [ wxGTK30 boost firebird ]; + nativeBuildInputs = [ cmake ]; - preBuild = '' - sed -i 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -nostartfiles/' Makefile - ''; - - configureFlags = [ - "--disable-debug" + buildInputs = [ + wxGTK32 + boost + firebird ]; meta = with lib; {