From f37effbc998e1fe81547c48b7d7382f9f66261a5 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:46 +0000 Subject: [PATCH] gams: move defaults to package file --- pkgs/tools/misc/gams/default.nix | 2 +- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index 990282b2d584..011231692f3a 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, file, licenseFile, optgamsFile}: +{ stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}: assert licenseFile != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22efa454676c..73112b71d1fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -674,10 +674,7 @@ in gamecube-tools = callPackage ../development/tools/gamecube-tools { }; - gams = callPackage ../tools/misc/gams { - licenseFile = config.gams.licenseFile or null; - optgamsFile = config.gams.optgamsFile or null; - }; + gams = callPackage ../tools/misc/gams (config.gams or {}); git-fire = callPackage ../tools/misc/git-fire { };