summary refs log tree commit diff
path: root/pkgs/development/idris-modules
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2019-08-02 16:42:21 +0200
committerSilvan Mosberger <infinisil@icloud.com>2019-08-02 16:42:21 +0200
commit1e2d93cfcd5c34435afe561b4be9d83baee2e898 (patch)
treeb52e12d03087106ef16001ccc137860d5ba46aab /pkgs/development/idris-modules
parentc6e7bc2977f728efcecfb954bbb38d436e98b798 (diff)
downloadnixpkgs-1e2d93cfcd5c34435afe561b4be9d83baee2e898.tar
nixpkgs-1e2d93cfcd5c34435afe561b4be9d83baee2e898.tar.gz
nixpkgs-1e2d93cfcd5c34435afe561b4be9d83baee2e898.tar.bz2
nixpkgs-1e2d93cfcd5c34435afe561b4be9d83baee2e898.tar.lz
nixpkgs-1e2d93cfcd5c34435afe561b4be9d83baee2e898.tar.xz
nixpkgs-1e2d93cfcd5c34435afe561b4be9d83baee2e898.tar.zst
nixpkgs-1e2d93cfcd5c34435afe561b4be9d83baee2e898.zip
idrisPackages: Fix overrides not applying
Previously when overriding idrisPackages, it wouldn't work properly because it
took idrisPackages from the pkgs set
Diffstat (limited to 'pkgs/development/idris-modules')
-rw-r--r--pkgs/development/idris-modules/build-idris-package.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index c67d53f8d9c..28bac4e981b 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