on iko/ghcjs-patch-master help sign in
Fix shell.nix (#499)
d241e56Michael Peyton Jones
@@ -1,11 +1,11 @@
1−with import <nixpkgs> {};
1+let
2−let this = import ./. {}; in
2+ pkgs = import ./nixpkgs/default.nix (import ./default.nix);
3−stdenv.mkDerivation rec {
3+in pkgs.stdenv.mkDerivation rec {
4 name = "env";
4 name = "env";
5− env = buildEnv { name = name; paths = buildInputs; };
5+ env = pkgs.buildEnv { name = name; paths = buildInputs; };
6 buildInputs = [
6 buildInputs = [
7− this.ghc
8− this.cabal-install
7+ pkgs.cabal-install
8+ pkgs.haskell-nix.ghc
9− this.nix-tools
9+ pkgs.haskell-nix.nix-tools
10 ];
10 ];
11}
11}