Author: ludo
Date: Fri Mar 2 15:57:36 2012
New Revision: 32746
URL: https://nixos.org/websvn/nix/?rev=32746&sc=1
Log:
lcov: Fix build on FreeBSD.
Added:
nixpkgs/trunk/pkgs/development/tools/analysis/lcov/freebsd-install.patch
Modified:
nixpkgs/trunk/pkgs/development/tools/analysis/lcov/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/analysis/lcov/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/analysis/lcov/default.nix Fri Mar
2 14:54:14 2012 (r32745)
+++ nixpkgs/trunk/pkgs/development/tools/analysis/lcov/default.nix Fri Mar
2 15:57:36 2012 (r32746)
@@ -9,8 +9,8 @@
};
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)
Added: nixpkgs/trunk/pkgs/development/tools/analysis/lcov/freebsd-install.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/analysis/lcov/freebsd-install.patch
Fri Mar 2 15:57:36 2012 (r32746)
@@ -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
+ }
+
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
