diff options
author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-11-01 08:31:54 +0100 |
---|---|---|
committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-11-01 08:31:54 +0100 |
commit | 609f8dc04b4604124e742bb114af9377d203a4cc (patch) | |
tree | 096dc9b70379e449392b557fb1d9b3e0faf53258 /pkgs/development/compilers/ghc | |
parent | b60d44a00a9218eccf1190bcc6bbb6ec929358d9 (diff) | |
parent | b6519f08da3321a8bc002e6608297a3225cc5439 (diff) | |
download | nixpkgs-609f8dc04b4604124e742bb114af9377d203a4cc.tar nixpkgs-609f8dc04b4604124e742bb114af9377d203a4cc.tar.gz nixpkgs-609f8dc04b4604124e742bb114af9377d203a4cc.tar.bz2 nixpkgs-609f8dc04b4604124e742bb114af9377d203a4cc.tar.lz nixpkgs-609f8dc04b4604124e742bb114af9377d203a4cc.tar.xz nixpkgs-609f8dc04b4604124e742bb114af9377d203a4cc.tar.zst nixpkgs-609f8dc04b4604124e742bb114af9377d203a4cc.zip |
Merge branch 'master' into stdenv-updates
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r-- | pkgs/development/compilers/ghc/with-packages.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 979b2480586..b32b12d5b95 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -10,7 +10,7 @@ let in buildEnv { name = "haskell-env-${ghc.name}"; - paths = stdenv.lib.filter (x: x ? ghc) (stdenv.lib.closePropagation (packages ++ [ghc])); + paths = stdenv.lib.filter (x: x ? ghc) (stdenv.lib.closePropagation packages) ++ [ghc]; postBuild = '' . ${makeWrapper}/nix-support/setup-hook |