Author: simons
Date: Fri Nov 5 14:35:30 2010
New Revision: 24604
URL: https://svn.nixos.org/websvn/nix/?rev=24604&sc=1
Log:
pkgs/tools/networking/pdsh: fixed location of "info" and "man" directories
Modified:
nixpkgs/trunk/pkgs/tools/networking/pdsh/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/pdsh/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/pdsh/default.nix Fri Nov 5
14:35:22 2010 (r24603)
+++ nixpkgs/trunk/pkgs/tools/networking/pdsh/default.nix Fri Nov 5
14:35:30 2010 (r24604)
@@ -14,27 +14,28 @@
library can be found. Obviously, though, this is a hack. */
NIX_LDFLAGS="-lgcc_s";
- # Setting --with-machines=$out in configureFlags doesn't seem to work,
- # so I specify configurePhase instead.
- configurePhase = "./configure --prefix=$out
--with-machines=$out/etc/machines"
- + " " + (if readline == null then "--without-readline" else
"--with-readline")
- + " " + (if ssh == null then "--without-ssh" else
"--with-ssh")
- + " " + (if pam == null then "--without-pam" else
"--with-pam")
- + " " + (if rsh == false then "--without-rsh" else
"--with-rsh")
- + " --with-dshgroups"
- + " --with-xcpu"
- + " --without-genders"
- + " --without-mqshell"
- + " --without-mrsh"
- + " --without-netgroup"
- + " --without-nodeattr"
- + " --without-nodeupdown"
- + " --without-qshell"
- + " --without-slurm"
- + " --enable-fast-install"
- + " --disable-dependency-tracking"
- + " --disable-debug"
- ;
+ preConfigure = ''
+ configureFlagsArray=(
+ "--infodir=$out/share/info"
+ "--mandir=$out/share/man"
+ "--with-machines=$out/etc/machines"
+ ${if readline == null then "--without-readline" else "--with-readline"}
+ ${if ssh == null then "--without-ssh" else "--with-ssh"}
+ ${if pam == null then "--without-pam" else "--with-pam"}
+ ${if rsh == false then "--without-rsh" else "--with-rsh"}
+ "--with-dshgroups"
+ "--with-xcpu"
+ "--without-genders"
+ "--without-mqshell"
+ "--without-mrsh"
+ "--without-netgroup"
+ "--without-nodeattr"
+ "--without-nodeupdown"
+ "--without-qshell"
+ "--without-slurm"
+ "--disable-debug"
+ )
+ '';
meta = {
homepage = "https://computing.llnl.gov/linux/pdsh.html";;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
