diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-10-07 20:28:19 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-10-07 20:28:19 -0400 |
| commit | b0486f317119a6135d9b50b500a898d5a822bf2d (patch) | |
| tree | 2c34abb2d7bf3fdf0f80957223d61e8d889c717a /pkgs/applications/science/physics | |
| parent | 38abb8f734ed93d37712c5e95671b139a33464f7 (diff) | |
| download | nixpkgs-b0486f317119a6135d9b50b500a898d5a822bf2d.tar nixpkgs-b0486f317119a6135d9b50b500a898d5a822bf2d.tar.gz nixpkgs-b0486f317119a6135d9b50b500a898d5a822bf2d.tar.bz2 nixpkgs-b0486f317119a6135d9b50b500a898d5a822bf2d.tar.lz nixpkgs-b0486f317119a6135d9b50b500a898d5a822bf2d.tar.xz nixpkgs-b0486f317119a6135d9b50b500a898d5a822bf2d.tar.zst nixpkgs-b0486f317119a6135d9b50b500a898d5a822bf2d.zip | |
pythia: 8.244 -> 8.303
Diffstat (limited to 'pkgs/applications/science/physics')
| -rw-r--r-- | pkgs/applications/science/physics/sacrifice/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/science/physics/sacrifice/pythia83xx.patch | 55 |
2 files changed, 56 insertions, 0 deletions
diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 609fea9f7dc..2c4757d92e4 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation { patches = [ ./compat.patch + ./pythia83xx.patch ]; preConfigure = '' diff --git a/pkgs/applications/science/physics/sacrifice/pythia83xx.patch b/pkgs/applications/science/physics/sacrifice/pythia83xx.patch new file mode 100644 index 00000000000..ea162e30c9a --- /dev/null +++ b/pkgs/applications/science/physics/sacrifice/pythia83xx.patch @@ -0,0 +1,55 @@ +diff --git a/include/Sacrifice/UserHooksFactory.hh b/include/Sacrifice/UserHooksFactory.hh +index 04b105b..19f2b4f 100644 +--- a/include/Sacrifice/UserHooksFactory.hh ++++ b/include/Sacrifice/UserHooksFactory.hh +@@ -12,7 +12,7 @@ + + namespace Sacrifice{ + +- using Pythia8::UserHooks; ++ using Pythia8::UserHooksPtr; + using std::string; + using std::map; + +@@ -21,7 +21,7 @@ namespace Sacrifice{ + + public: + +- static UserHooks* create(const string &hookName); ++ static UserHooksPtr create(const string &hookName); + + /** + * Loads a library of UserHooks +@@ -39,7 +39,7 @@ namespace Sacrifice{ + + class ICreator{ + public: +- virtual UserHooks *create() const = 0; ++ virtual UserHooksPtr create() const = 0; + virtual ~ICreator(){}; + }; + +@@ -61,8 +61,8 @@ namespace Sacrifice{ + } + } + +- UserHooks *create()const{ +- return new T; ++ UserHooksPtr create()const{ ++ return std::make_shared<T>(); + } + + private: +diff --git a/src/UserHooksFactory.cxx b/src/UserHooksFactory.cxx +index 84a485b..5274119 100644 +--- a/src/UserHooksFactory.cxx ++++ b/src/UserHooksFactory.cxx +@@ -11,7 +11,7 @@ namespace Sacrifice{ + using std::ifstream; + + ////////////////////////////////////////////////////////////////////////////// +- UserHooks *UserHooksFactory::create(const string &name){ ++ UserHooksPtr UserHooksFactory::create(const string &name){ + map<string, const ICreator*>::const_iterator it = s_creators().find(name); + if(it == s_creators().end()){ + //eek! |