diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-07-03 21:19:28 +0200 |
|---|---|---|
| committer | Silvan Mosberger <infinisil@icloud.com> | 2018-07-05 19:10:27 +0200 |
| commit | 5f620d0e221d09e9ea6da6bd46794f91c7db7e2d (patch) | |
| tree | 9f9b8fe9faf33b9e7e86b53478a04d3bca2524c9 /pkgs/development/idris-modules | |
| parent | ef0073410d034ce852785ac5a5e4dc7e2012a34a (diff) | |
| download | nixpkgs-5f620d0e221d09e9ea6da6bd46794f91c7db7e2d.tar nixpkgs-5f620d0e221d09e9ea6da6bd46794f91c7db7e2d.tar.gz nixpkgs-5f620d0e221d09e9ea6da6bd46794f91c7db7e2d.tar.bz2 nixpkgs-5f620d0e221d09e9ea6da6bd46794f91c7db7e2d.tar.lz nixpkgs-5f620d0e221d09e9ea6da6bd46794f91c7db7e2d.tar.xz nixpkgs-5f620d0e221d09e9ea6da6bd46794f91c7db7e2d.tar.zst nixpkgs-5f620d0e221d09e9ea6da6bd46794f91c7db7e2d.zip | |
build-idris-package: includePreludeBase -> noPrelude, noBase
Resembles idris --noprelude and --nobasepkgs arguments
Diffstat (limited to 'pkgs/development/idris-modules')
| -rw-r--r-- | pkgs/development/idris-modules/build-builtin-package.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/idris-modules/build-idris-package.nix | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index a90bb8c11b6..1cd687058b3 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -10,7 +10,8 @@ build-idris-package { inherit name version; inherit (idris) src; - includePreludeBase = false; + noPrelude = true; + noBase = true; idrisDeps = deps; diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 47e1e22c5db..7168eb2c956 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -1,15 +1,18 @@ # Build an idris package { stdenv, lib, idrisPackages, gmp }: { idrisDeps ? [] - , includePreludeBase ? true + , noPrelude ? false + , noBase ? false , name , version , extraBuildInputs ? [] , ... }@attrs: let - idrisDeps' = idrisDeps ++ lib.optionals includePreludeBase (with idrisPackages; [ prelude base ]); - idris-with-packages = idrisPackages.with-packages idrisDeps'; + allIdrisDeps = idrisDeps + ++ lib.optional (!noPrelude) idrisPackages.prelude + ++ lib.optional (!noBase) idrisPackages.base; + idris-with-packages = idrisPackages.with-packages allIdrisDeps; newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "extraBuildInputs" "name" "version" ] // { meta = attrs.meta // { platforms = attrs.meta.platforms or idrisPackages.idris.meta.platforms; @@ -20,7 +23,7 @@ stdenv.mkDerivation ({ name = "${name}-${version}"; buildInputs = [ idris-with-packages gmp ] ++ extraBuildInputs; - propagatedBuildInputs = idrisDeps'; + propagatedBuildInputs = allIdrisDeps; # Some packages use the style # opts = -i ../../path/to/package |