summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-02-02 10:24:18 -0600
committerWill Dietz <w@wdtz.org>2018-02-02 10:24:18 -0600
commit8a1069bdcb32a0e3fb33da1b795971226d3fd179 (patch)
treef4206ddf7f235adfddae5ea2144f48c88852fc33 /pkgs
parent374d6dcf2a08ea1da482d428f6972add3ce40026 (diff)
downloadnixpkgs-8a1069bdcb32a0e3fb33da1b795971226d3fd179.tar
nixpkgs-8a1069bdcb32a0e3fb33da1b795971226d3fd179.tar.gz
nixpkgs-8a1069bdcb32a0e3fb33da1b795971226d3fd179.tar.bz2
nixpkgs-8a1069bdcb32a0e3fb33da1b795971226d3fd179.tar.lz
nixpkgs-8a1069bdcb32a0e3fb33da1b795971226d3fd179.tar.xz
nixpkgs-8a1069bdcb32a0e3fb33da1b795971226d3fd179.tar.zst
nixpkgs-8a1069bdcb32a0e3fb33da1b795971226d3fd179.zip
fastjet: Fix build w/clang5
https://hydra.nixos.org/build/68588849/nixlog/1

libtool: compile:  clang++ -DHAVE_CONFIG_H -I. -I../../include/fastjet -O2 -Wall -g -Woverloaded-virtual -DDROP_CGAL -I. -I./siscone -I./../../include -I./siscone -c SISConeBasePlugin.cc  -fno-common -DPIC -o .libs/libSISConePlugin_la-SISConeBasePlugin.o
SISConeBasePlugin.cc:12:12: error: no matching member function for call to 'structure_of'
  return a.structure_of<UserScaleBase::StructureType>().ordering_var2()
         ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./../../include/fastjet/PseudoJet.hh:1012:60: note: candidate template ignored: substitution failure [with TransformerType = fastjet::SISConeBasePlugin::UserScaleBase::StructureType]: ISO C++ specifies that qualified reference to 'StructureType' is a constructor name rather than a type in this context, despite preceding 'typename' keyword
const typename TransformerType::StructureType & PseudoJet::structure_of() const{
      ~~~~~~~~                                             ^
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/physics/fastjet/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix
index 780dcc3770f..0ee68415b89 100644
--- a/pkgs/development/libraries/physics/fastjet/default.nix
+++ b/pkgs/development/libraries/physics/fastjet/default.nix
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ python2 ];
 
+  postPatch = ''
+    substituteInPlace plugins/SISCone/SISConeBasePlugin.cc \
+      --replace 'structure_of<UserScaleBase::StructureType>()' \
+                'structure_of<UserScaleBase>()'
+  '';
+
   configureFlags = [
     "--enable-allcxxplugins"
     "--enable-pyext"