diff options
-rw-r--r-- | pkgs/development/compilers/ghc/with-packages.nix | 70 | ||||
-rw-r--r-- | pkgs/stdenv/adapters.nix | 8 |
2 files changed, 0 insertions, 78 deletions
diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix deleted file mode 100644 index 9909c49e1435..000000000000 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv, ghc, packages, buildEnv, makeWrapper, ignoreCollisions ? false }: - -# This wrapper works only with GHC 6.12 or later. -assert stdenv.lib.versionOlder "6.12" ghc.version; - -# It's probably a good idea to include the library "ghc-paths" in the -# compiler environment, because we have a specially patched version of -# that package in Nix that honors these environment variables -# -# NIX_GHC -# NIX_GHCPKG -# NIX_GHC_DOCDIR -# NIX_GHC_LIBDIR -# -# instead of hard-coding the paths. The wrapper sets these variables -# appropriately to configure ghc-paths to point back to the wrapper -# instead of to the pristine GHC package, which doesn't know any of the -# additional libraries. -# -# A good way to import the environment set by the wrapper below into -# your shell is to add the following snippet to your ~/.bashrc: -# -# if [ -e ~/.nix-profile/bin/ghc ]; then -# eval $(grep export ~/.nix-profile/bin/ghc) -# fi - -let - ghc761OrLater = stdenv.lib.versionOlder "7.6.1" ghc.version; - packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - libDir = "$out/lib/ghc-${ghc.version}"; - docDir = "$out/share/doc/ghc/html"; - packageCfgDir = "${libDir}/package.conf.d"; - isHaskellPkg = x: (x ? pname) && (x ? version); -in -if packages == [] then ghc else -buildEnv { - name = "haskell-env-${ghc.name}"; - paths = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages) ++ [ghc]; - inherit ignoreCollisions; - postBuild = '' - . ${makeWrapper}/nix-support/setup-hook - - for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do - rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ - --add-flags '"-B$NIX_GHC_LIBDIR"' \ - --set "NIX_GHC" "$out/bin/ghc" \ - --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ - --set "NIX_GHC_DOCDIR" "${docDir}" \ - --set "NIX_GHC_LIBDIR" "${libDir}" - done - - for prg in runghc runhaskell; do - rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ - --add-flags "-f $out/bin/ghc" \ - --set "NIX_GHC" "$out/bin/ghc" \ - --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ - --set "NIX_GHC_DOCDIR" "${docDir}" \ - --set "NIX_GHC_LIBDIR" "${libDir}" - done - - for prg in ghc-pkg ghc-pkg-${ghc.version}; do - rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" - done - - $out/bin/ghc-pkg recache - ''; -} diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 0b6707bf8b16..11f9a43c035e 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -70,7 +70,6 @@ rec { getCrossDrv = drv: drv.crossDrv or drv; nativeBuildInputsDrvs = map getNativeDrv nativeBuildInputs; buildInputsDrvs = map getCrossDrv buildInputs; - buildInputsDrvsAsBuildInputs = map getNativeDrv buildInputs; propagatedBuildInputsDrvs = map getCrossDrv propagatedBuildInputs; propagatedNativeBuildInputsDrvs = map getNativeDrv propagatedNativeBuildInputs; @@ -239,11 +238,4 @@ rec { NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -fuse-ld=gold"; }); }; - - dropCxx = drv: drv.override { - stdenv = if pkgs.stdenv.isDarwin - then pkgs.allStdenvs.stdenvDarwinNaked - else pkgs.stdenv; - }; - } |