swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Viking: Make tests happier.

Browse source 
svn path=/nixpkgs/trunk/; revision=15805
This commit is contained in:
Ludovic Courtès 2009-05-30 21:32:01 +00:00
parent aa2fe97649
commit 3245777347
3 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/misc/viking/default.nix
View file

@ -1,4 +1,5 @@
{ fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl }:
{ fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl
, bc, file }:
stdenv.mkDerivation rec {
name = "viking-0.9.8";
@ -8,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1is8g6ld5pd13iiv9qm8526q1cblg01pqyakg52sd6k7fys7dz2d";
};
buildInputs = [ pkgconfig intltool gettext gtk expat curl ];
patches = [ ./test-bc.patch ];
buildInputs = [ pkgconfig intltool gettext gtk expat curl bc file ];
# XXX: Remove this once we have `gpsd' (http://gpsd.berlios.de/).
configureFlags = "--disable-realtime-gps-tracking";

22
pkgs/applications/misc/viking/test-bc.patch Normal file
View file

@ -0,0 +1,22 @@
For some reason, `bc -l' yields no output.
--- viking-0.9.8/test/check_degrees_conversions.sh 2008-03-15 23:01:48.000000000 +0100
+++ viking-0.9.8/test/check_degrees_conversions.sh 2009-05-30 23:23:27.000000000 +0200
@@ -7,7 +7,7 @@ function check_success()
for value in "$@"
do
result=`./degrees_converter "$value" | cut -d' ' -f3`
- diff=`echo "$result - $expected" | bc -l`
+ diff=`echo "$result - $expected" | bc`
if [ $diff != 0 ]
then
echo "$value -> $result != $expected"
@@ -23,7 +23,7 @@ function check_failure()
for value in "$@"
do
result=`./degrees_converter "$value" | cut -d' ' -f3`
- diff=`echo "$result - $expected" | bc -l`
+ diff=`echo "$result - $expected" | bc`
if [ $diff = 0 ]
then
echo "$value -> $result = $expected"

3
pkgs/top-level/all-packages.nix
View file

@ -1356,7 +1356,8 @@ let
};
viking = import ../applications/misc/viking {
inherit fetchurl stdenv pkgconfig intltool gettext expat curl;
inherit fetchurl stdenv pkgconfig intltool gettext expat curl
bc file;
inherit (gtkLibs) gtk;
};