From 67d7dade521d52657b4269758a38d566aeafca37 Mon Sep 17 00:00:00 2001
From: Valentin Reis <vreis@anl.gov>
Date: Tue, 11 Jun 2019 10:00:42 -0500
Subject: [PATCH] candl

---
 pkgs/candle/default.nix | 5 ++---
 pkgs/default.nix        | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/candle/default.nix b/pkgs/candle/default.nix
index 972d76b..e3baffb 100644
--- a/pkgs/candle/default.nix
+++ b/pkgs/candle/default.nix
@@ -1,8 +1,7 @@
 { lib
 , src
 , stdenv
-, libnrm
-, nrmSupport ? false
+, nrm
 , pythonPackages
 , hdf5
 }:
@@ -28,6 +27,6 @@ stdenv.mkDerivation rec {
     pythonPackages.tqdm
     pythonPackages.numpy
     pythonPackages.opencv
-  ] ++ (optional nrmSupport libnrm);
+  ];
 
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 5bbc4a3..f9aeadd 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -178,7 +178,7 @@ let
     candlePkgs = import pkgs.path {
       overlays = [ candleOverlay ] ;
     };
-    candle       = callCandlePackage ./candle {src = candle-src; libnrm= libnrm;};
+    candle       = callCandlePackage ./candle {src = candle-src; nrm= nrm;};
 
     # data (static, non source overridable via arguments)
     openmc-data = fetched openmc/data.json;
-- 
2.26.2