summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2018-02-03 10:01:51 -0500
committerGitHub <noreply@github.com>2018-02-03 10:01:51 -0500
commitdbd9e7fcb28508bf9e9bebc44f23f4f141e1c627 (patch)
treed3d95205f31d2af3a9bfff9f4a279ad15b2cab9f /pkgs
parentc56b13a06f853b6e51378753c5b7c3e1bcfb585e (diff)
parent8a1069bdcb32a0e3fb33da1b795971226d3fd179 (diff)
downloadnixpkgs-dbd9e7fcb28508bf9e9bebc44f23f4f141e1c627.tar
nixpkgs-dbd9e7fcb28508bf9e9bebc44f23f4f141e1c627.tar.gz
nixpkgs-dbd9e7fcb28508bf9e9bebc44f23f4f141e1c627.tar.bz2
nixpkgs-dbd9e7fcb28508bf9e9bebc44f23f4f141e1c627.tar.lz
nixpkgs-dbd9e7fcb28508bf9e9bebc44f23f4f141e1c627.tar.xz
nixpkgs-dbd9e7fcb28508bf9e9bebc44f23f4f141e1c627.tar.zst
nixpkgs-dbd9e7fcb28508bf9e9bebc44f23f4f141e1c627.zip
Merge pull request #34534 from dtzWill/fix/fastjet-clang5
fastjet: Fix build w/clang5
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"