From 99a331d6139e08e0dfc2437b399e088496129419 Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Thu, 18 Jan 2018 00:21:17 -0500 Subject: [PATCH] meraculous: Convert to new overlay system --- pkgs/all-packages.nix | 2 ++ meraculous.nix => pkgs/meraculous.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) rename meraculous.nix => pkgs/meraculous.nix (90%) diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix index d68bd59..8913f52 100644 --- a/pkgs/all-packages.nix +++ b/pkgs/all-packages.nix @@ -3,4 +3,6 @@ self: pkgs: with pkgs; { cryptominisat = callPackage ./cryptominisat.nix { }; firedrake = callPackage ./firedrake { }; + + meraculous = callPackage ./meraculous.nix { }; } diff --git a/meraculous.nix b/pkgs/meraculous.nix similarity index 90% rename from meraculous.nix rename to pkgs/meraculous.nix index 50db1a6..17e1d5c 100644 --- a/meraculous.nix +++ b/pkgs/meraculous.nix @@ -1,4 +1,5 @@ -with import { }; +{ stdenv, overrideCC, gcc49, fetchurl, makeWrapper, gzip, cmake +, boost159, perl, perlPackages, gnuplot }: # gcc 5.x c++11 requires istream to be explicitly cast to bool