From 475cbea1015ad87a262a4974651289ae0098322b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Dec 2010 17:43:57 +0000 Subject: [PATCH] pkgs/tools/text/replace: move --mandir to standard location $out/share/man Also, fixed the type of $makeFlags, which is a string, not a list. svn path=/nixpkgs/branches/stdenv-updates/; revision=25006 --- pkgs/tools/text/replace/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 339bf510c4b..01e58146ed8 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -8,12 +8,13 @@ stdenv.mkDerivation { sha256 = "1c2nkxx83vmlh1v3ib6r2xqh121gdb1rharwsimcb2h0xwc558dm"; }; - makeFlags = ["TREE=\$(out)"]; + makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man"; crossAttrs = { - makeFlags = [ "TREE=\$(out)" "CC=${stdenv.cross.config}-gcc" ]; + makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man CC=${stdenv.cross.config}-gcc"; }; + preInstall = "ensureDir \$out/share/man"; postInstall = "mv \$out/bin/replace \$out/bin/replace-literal"; patches = [./malloc.patch];