From d8849a045edb5fb546f5f3b6e070449cab6a949c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 2 Mar 2012 15:57:36 +0000 Subject: [PATCH] lcov: Fix build on FreeBSD. svn path=/nixpkgs/trunk/; revision=32746 --- pkgs/development/tools/analysis/lcov/default.nix | 4 ++-- .../tools/analysis/lcov/freebsd-install.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/analysis/lcov/freebsd-install.patch diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index c768669bda9..8f4c118c08e 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { }; patches = - [ ./find-source.patch - ]; + [ ./find-source.patch ] + ++ (stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch); preBuild = '' makeFlagsArray=(PREFIX=$out BIN_DIR=$out/bin MAN_DIR=$out/share/man) diff --git a/pkgs/development/tools/analysis/lcov/freebsd-install.patch b/pkgs/development/tools/analysis/lcov/freebsd-install.patch new file mode 100644 index 00000000000..5d6b7e6d9ed --- /dev/null +++ b/pkgs/development/tools/analysis/lcov/freebsd-install.patch @@ -0,0 +1,13 @@ +FreeBSD's `install' doesn't support `-D'. Thus, use GNU install instead, +since `stdenv-native' assumes that `ginstall' is available. + +--- lcov-1.9/bin/install.sh 2012-03-02 16:53:28.000000000 +0100 ++++ lcov-1.9/bin/install.sh 2010-08-06 13:05:17.000000000 +0200 +@@ -34,7 +34,7 @@ do_install() + local TARGET=$2 + local PARAMS=$3 + +- ginstall -p -D $PARAMS $SOURCE $TARGET ++ install -p -D $PARAMS $SOURCE $TARGET + } +