From 1e2d93cfcd5c34435afe561b4be9d83baee2e898 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 2 Aug 2019 16:42:21 +0200 Subject: idrisPackages: Fix overrides not applying Previously when overriding idrisPackages, it wouldn't work properly because it took idrisPackages from the pkgs set --- pkgs/development/idris-modules/build-idris-package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/development/idris-modules') diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index c67d53f8d9c28..28bac4e981b0b 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -1,5 +1,5 @@ # Build an idris package -{ stdenv, lib, idrisPackages, gmp }: +{ stdenv, lib, gmp, prelude, base, with-packages, idris }: { idrisDeps ? [] , noPrelude ? false , noBase ? false @@ -11,15 +11,15 @@ }@attrs: let allIdrisDeps = idrisDeps - ++ lib.optional (!noPrelude) idrisPackages.prelude - ++ lib.optional (!noBase) idrisPackages.base; - idris-with-packages = idrisPackages.with-packages allIdrisDeps; + ++ lib.optional (!noPrelude) prelude + ++ lib.optional (!noBase) base; + idris-with-packages = with-packages allIdrisDeps; newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "noPrelude" "noBase" "name" "version" "ipkgName" "extraBuildInputs" ] // { meta = attrs.meta // { - platforms = attrs.meta.platforms or idrisPackages.idris.meta.platforms; + platforms = attrs.meta.platforms or idris.meta.platforms; }; }; in -- cgit 1.4.1