diff options
| -rw-r--r-- | pkgs/applications/misc/viking/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/misc/viking/test-bc.patch | 22 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 29 insertions, 3 deletions
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 9b9387f6053d..eabd4a020f61 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -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"; diff --git a/pkgs/applications/misc/viking/test-bc.patch b/pkgs/applications/misc/viking/test-bc.patch new file mode 100644 index 000000000000..fc0c91eec522 --- /dev/null +++ b/pkgs/applications/misc/viking/test-bc.patch @@ -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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03eb1c2b2d9f..04cb80174d3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |