From 88ca6dd78a320d8eb8ee99a074e7ffceedeabc1e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:47 +0000 Subject: [PATCH] cplex: move defaults to package file --- pkgs/applications/science/math/cplex/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index fe3913648f87..dae5e1b76d35 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath }: +{ stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath ? null }: # To use this package, you need to download your own cplex installer from IBM # and override the releasePath attribute to point to the location of the file. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73112b71d1fd..a9c07edc2c87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1156,7 +1156,7 @@ in coprthr = callPackage ../development/libraries/coprthr { }; - cplex = callPackage ../applications/science/math/cplex { releasePath = config.cplex.releasePath or null; }; + cplex = callPackage ../applications/science/math/cplex (config.cplex or {}); cpulimit = callPackage ../tools/misc/cpulimit { };