public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Remove dontMakeInstall, it's no longer necessary (just set

Browse Source 
installCommand to true or something).

svn path=/nixpkgs/trunk/; revision=7495
This commit is contained in:
Eelco Dolstra 2006-12-27 17:48:46 +00:00
parent 8ab9a58e0d
commit 2dd4e1b9d3
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/docs/todo.txt
View File

@ -2,8 +2,6 @@
directories for libraries (like setup.sh does now). [do we want directories for libraries (like setup.sh does now). [do we want
this?] this?]
* In setup.sh: add configureFlagsArray or something
* Inform freedesktop people that Xaw requires Xpm. * Inform freedesktop people that Xaw requires Xpm.
* After building gcc, filter out references to /tmp/nix... in * After building gcc, filter out references to /tmp/nix... in
@ -14,7 +12,3 @@
[Move from libbonoboui] [Move from libbonoboui]
* Fix the bzip2 build generically. * Fix the bzip2 build generically.
* In stdenv/setup.sh: put the call to patchelf etc. in a separate
phase (fixupPhase?) that comes after the installPhase. This is so
that when one overrides installPhase, the fixup stuff is still done.

14
pkgs/stdenv/generic/setup-new2.sh
View File

@ -642,15 +642,13 @@ installW() {
ensureDir "$prefix" ensureDir "$prefix"
if test -z "$installCommand"; then if test -z "$installCommand"; then
if test -z "$dontMakeInstall"; then if test -z "$installTargets"; then
if test -z "$installTargets"; then installTargets=install
installTargets=install
fi
echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
make $installTargets \
$makeFlags ${makeFlagsArray[@]} \
$installFlags "${installFlagsArray[@]}" || fail
fi fi
echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
make $installTargets \
$makeFlags ${makeFlagsArray[@]} \
$installFlags "${installFlagsArray[@]}" || fail
else else
eval "$installCommand" eval "$installCommand"
fi fi