diff --git a/nix/stdenv-drvs.nix b/nix/stdenv-drvs.nix deleted file mode 100644 index 98f671b0..00000000 --- a/nix/stdenv-drvs.nix +++ /dev/null @@ -1,11 +0,0 @@ -pkgs: - -with pkgs; - -(lib.foldr - (x: acc: - if lib.isDerivation x - then [ x ] ++ (lib.filter (y: x.drvPath != y.drvPath) acc) - else acc) - [ ] - stdenv.allowedRequisites) diff --git a/shell.nix b/shell.nix index e888166c..25df1430 100644 --- a/shell.nix +++ b/shell.nix @@ -7,10 +7,13 @@ }: (pkgs.buildFHSUserEnv { name = "hs-fhs"; - targetPkgs = ps: import ./nix/stdenv-drvs.nix ps ++ (with ps; [ + targetPkgs = ps: (with ps; [ haskellPackages.alex - autoconf269 + autoconf + automake binaryen + binutils + gcc haskell.compiler.ghc884 git gmp.dev @@ -25,8 +28,8 @@ zlib.dev ]); profile = '' - export LANG=en_US.utf8; - unset SSL_CERT_FILE; - unset NIX_SSL_CERT_FILE; + export LANG=en_US.utf8 + unset NIX_SSL_CERT_FILE + unset SSL_CERT_FILE ''; }).env