diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2020-10-04 09:00:16 -0700 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-10-05 10:55:06 -0700 |
| commit | 90e5082576627225d6ae16f6737f3c66a3267511 (patch) | |
| tree | afde7fdb0a85927ac77e859b19e663749b7610b8 /pkgs/applications/misc/ape | |
| parent | 2523024f49e7b45ce137c2c3915a096d7c68746f (diff) | |
ape: don't inherit lexicon from pkgs scope
Diffstat (limited to 'pkgs/applications/misc/ape')
| -rw-r--r-- | pkgs/applications/misc/ape/apeclex.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/ape/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/ape/apeclex.nix b/pkgs/applications/misc/ape/apeclex.nix index 710ddfec9942..8accc06fac26 100644 --- a/pkgs/applications/misc/ape/apeclex.nix +++ b/pkgs/applications/misc/ape/apeclex.nix @@ -2,7 +2,7 @@ callPackage ./. { pname = "ape-clex"; - lexicon = "${attemptoClex}/clex_lexicon.pl"; + lexiconPath = "${attemptoClex}/clex_lexicon.pl"; description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)"; license = with stdenv.lib; [ licenses.lgpl3 licenses.gpl3 ]; } diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index 0d8ebccb3d02..dda6c812c8d8 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -1,10 +1,10 @@ { stdenv, swiProlog, makeWrapper, fetchFromGitHub, - lexicon ? "prolog/lexicon/clex_lexicon.pl", + lexiconPath ? "prolog/lexicon/clex_lexicon.pl", pname ? "ape", description ? "Parser for Attempto Controlled English (ACE)", license ? with stdenv.lib; licenses.lgpl3 - }: +}: stdenv.mkDerivation rec { inherit pname; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patchPhase = '' # We move the file first to avoid "same file" error in the default case - cp ${lexicon} new_lexicon.pl + cp ${lexiconPath} new_lexicon.pl rm prolog/lexicon/clex_lexicon.pl cp new_lexicon.pl prolog/lexicon/clex_lexicon.pl ''; |