diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-01-13 10:03:16 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-01-13 10:03:16 +0000 |
| commit | 9b9b5e2f53b342128a8c450c61ee40adb48cb462 (patch) | |
| tree | 64b85838d8d281dff24318cf8779daeb63804b2a /pkgs | |
| parent | 2ae2385f2634093c365114334b6d3fd091870d57 (diff) | |
Work around hard-coded `/usr/bin/nroff' in `configure'.
svn path=/nixpkgs/trunk/; revision=25533
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/libedit/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/security/mktemp/default.nix | 9 |
3 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 12f4759f85d80..f139379328ac6 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { sha256 = "18a4w0n1n0sij7gkb3196dnqav5zr0c5p26f08k7cw6y0i9dz0sq"; }; + # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. + NROFF = "${groff}/bin/nroff"; + buildInputs = (ops cursesSupport [ ncurses readline ] ) ++ (op docSupport groff ) ++ (op zlibSupport zlib) diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index fb45563a17935..dca4d8efc1347 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses}: +{ stdenv, fetchurl, ncurses, groff }: stdenv.mkDerivation rec { name = "libedit-20100424-3.0"; @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "11hxaq58gym7kqccjhxywjxdibffzg545z1aj997y1dn0rckhav0"; }; + # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. + NROFF = "${groff}/bin/nroff"; + postInstall = '' sed -i s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc ''; diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix index 001fa4f095359..4017aa4f9f192 100644 --- a/pkgs/tools/security/mktemp/default.nix +++ b/pkgs/tools/security/mktemp/default.nix @@ -1,8 +1,11 @@ -{stdenv, fetchurl}: - +{ stdenv, fetchurl, groff }: + stdenv.mkDerivation { name = "mktemp-1.6"; - + + # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. + NROFF = "${groff}/bin/nroff"; + src = fetchurl { url = ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.6.tar.gz; sha256 = "1nfj89b0dv1c2fyqi1pg54fyzs3462cbp7jv7lskqsxvqy4mh9x1"; |