From cd9c9a2431eb5f8e6f39968a897a36165bdcf9e8 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 16:52:36 +0000
Subject: [PATCH] fix broken myEnv
svn path=/nixpkgs/trunk/; revision=15382
---
pkgs/misc/my-env/default.nix | 2 +-
pkgs/misc/my_env/default.nix | 58 ------------------------------------
2 files changed, 1 insertion(+), 59 deletions(-)
delete mode 100644 pkgs/misc/my_env/default.nix
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index d876991ce6ac..647e5dcab3c2 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -45,7 +45,7 @@ mkDerivation {
name = "env-${name}";
phases = "buildPhase";
setupNew = substituteAll {
- src = ../../stdenv/generic/setup-new.sh;
+ src = ../../stdenv/generic/setup.sh;
preHook="";
postHook="";
initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; };
diff --git a/pkgs/misc/my_env/default.nix b/pkgs/misc/my_env/default.nix
deleted file mode 100644
index 9853041832d8..000000000000
--- a/pkgs/misc/my_env/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-# idea: provide nix environment for your developement actions
-# experimental
-
-/*
- # example:
- # add postgresql to environment and create ctags (tagfiles can be extracted from TAG_FILES)
- # add this to your ~/.nixpkgs/config.nix
-
- devEnvs = pkgs : with pkgs; with sourceAndTags;
- let simple = { name, buildInputs ? [], cTags ? [] }:
- pkgs.myEnvFun {
- inherit name stdenv;
- buildInputs = buildInputs
- ++ map (x : sourceWithTagsDerivation ( (addCTaggingInfo x ).passthru.sourceWithTags ) ) cTags;
- extraCmds = ". ~/.bashrc; cd $PWD
- # configure should find them
- export LDFLAGS=$NIX_LDFLAGS
- export CFLAGS=$NIX_CFLAGS_COMPILE
- ";
- preBuild = "export TAG_FILES";
- };
- in {
- postgresql = simple {
- name = "postgresql";
- buildInputs = [postgresql];
- cTags = [postgresql ];
- };
- };
-
- Put this into your .bashrc
- loadEnv(){ . "${HOME}/.nix-profile/dev-envs/${1}" }
- then install and
- $ loadEnv postgresql
-
-*/
-
-args: args.stdenv.mkDerivation (
- { extraCmds =""; } // {
- phases = "buildPhase";
- buildPhase = ''
- eval "$preBuild"
- name=${args.name}
- o=$out/dev-envs/$name
- ensureDir `dirname $o`
- echo "
- OLDPATH=\$PATH " >> $o
- export | grep -v HOME= | grep -v PATH= | grep -v PWD= | grep -v TEMP= | grep -v TMP= >> $o
- echo "
- PATH=$PATH:$OLDPATH
- for i in \$buildInputs; do
- export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$i/lib
- done
- export PATH=\$PATH:\$OLDPATH
- $extraCmds
- echo env $name loaded
- " >> $o
- '';
-} // args // { name = "${args.name}-env"; } )