diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-05 10:00:23 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-05 10:00:23 +0000 |
| commit | 57fd764a391a6215165c377e1936204f297905c9 (patch) | |
| tree | e93f78b2cb4718187f5b693e3655499ee6ba485a /pkgs/development/tools/analysis | |
| parent | a88fdf8ef7cd09efb795b2b3a7e41ec95bdc457f (diff) | |
| parent | e657e2c455d17fddd6d79eb93a1d08836a2e2b28 (diff) | |
| download | nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.gz nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.bz2 nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.lz nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.xz nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.zst nixpkgs-57fd764a391a6215165c377e1936204f297905c9.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
Diffstat (limited to 'pkgs/development/tools/analysis')
| -rw-r--r-- | pkgs/development/tools/analysis/lcov/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/lcov/freebsd-install.patch | 13 |
2 files changed, 15 insertions, 2 deletions
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 + } + |