* Don't fixup "#! /bin/sh" in Autoconf/Automake/Libtool, otherwise they

will use the "fixed" path in generated files.

svn path=/nixpkgs/trunk/; revision=12485
This commit is contained in:
Eelco Dolstra 2008-08-04 14:37:51 +00:00
parent c62b4b2135
commit 0846ca2e5b
7 changed files with 43 additions and 3 deletions

View file

@ -2,16 +2,22 @@
stdenv.mkDerivation rec {
name = "autoconf-2.62";
src = fetchurl {
url = "mirror://gnu/autoconf/${name}.tar.lzma";
sha256 = "0wc70i36cjw5kszvp50d02w8fzh2yxnsa9la6chrf7csb0dnn4jn";
};
buildInputs = [m4 perl lzma];
unpackCmd="lzma -d < $src | tar -x ";
doCheck = true;
# Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
# "fixed" path in generated files!
dontPatchShebangs = true;
meta = {
homepage = http://www.gnu.org/software/autoconf/;
description = "GNU Autoconf, a part of the GNU Build System";

View file

@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
doCheck = true;
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files!
dontPatchShebangs = true;
meta = {
homepage = http://www.gnu.org/software/automake/;
description = "GNU Automake, a GNU standard-compliant makefile generator";

View file

@ -9,4 +9,8 @@ stdenv.mkDerivation {
md5 = "571fd0b0598eb2a27dcf68adcfddfacb";
};
buildInputs = [perl autoconf];
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files!
dontPatchShebangs = true;
}

View file

@ -9,4 +9,8 @@ stdenv.mkDerivation {
md5 = "c60f77a42f103606981d456f1615f5b4";
};
buildInputs = [perl autoconf];
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files!
dontPatchShebangs = true;
}

View file

@ -2,9 +2,15 @@
stdenv.mkDerivation rec {
name = "libtool-1.5.26";
src = fetchurl {
url = "mirror://gnu/libtool/" + name + ".tar.gz";
url = "mirror://gnu/libtool/${name}.tar.gz";
sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w";
};
buildInputs = [m4 perl];
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files!
dontPatchShebangs = true;
}

View file

@ -0,0 +1,10 @@
{stdenv, fetchurl, m4, perl}:
stdenv.mkDerivation rec {
name = "libtool-1.5.26";
src = fetchurl {
url = "mirror://gnu/libtool/" + name + ".tar.gz";
sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w";
};
buildInputs = [m4 perl];
}

View file

@ -2259,6 +2259,10 @@ let pkgs = rec {
inherit fetchurl stdenv perl m4;
};
libtoolOld = lowPrio (import ../development/tools/misc/libtool/old.nix {
inherit fetchurl stdenv perl m4;
});
lsof = import ../development/tools/misc/lsof {
inherit fetchurl stdenv;
};
@ -2402,7 +2406,8 @@ let pkgs = rec {
acl = useFromStdenv "acl"
(import ../development/libraries/acl {
inherit stdenv fetchurl gettext attr libtool;
inherit stdenv fetchurl gettext attr;
libtool = libtoolOld;
});
adns = selectVersion ../development/libraries/adns "1.4" {
@ -2458,7 +2463,8 @@ let pkgs = rec {
attr = useFromStdenv "attr"
(import ../development/libraries/attr {
inherit stdenv fetchurl libtool gettext;
inherit stdenv fetchurl gettext;
libtool = libtoolOld;
});
axis = import ../development/libraries/axis {