diff options
author | Peter Simons <simons@cryp.to> | 2016-03-04 23:05:48 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2016-03-04 23:05:48 +0100 |
commit | 288d01fe2ba697531f48859c593e1647a8b91e5f (patch) | |
tree | 62b4e58e6bee7e0f5f20c38ece06516f2719ea84 | |
parent | 798a14d22cc3e3c9f83b2c05f417c2cdfc0f5a44 (diff) |
stellarium: update to 0.14.2
This patch also fixes https://github.com/NixOS/nixpkgs/issues/13582.
-rw-r--r-- | pkgs/applications/science/astronomy/stellarium/default.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index e77e848bed2cd..7798b1bef6c10 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt5Full, perl, libiconv }: +{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv +, qtscript, qtserialport, qttools +}: stdenv.mkDerivation rec { - name = "stellarium-0.13.3"; + name = "stellarium-0.14.2"; src = fetchurl { url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "1ml6z2xda4vx61agdz54x8fw1b115gwc7rcy0zhz1jh6g5jvf0ij"; + sha256 = "1xxil0rv61zc08znfv83cpsc47y1gjl2f3njhz0pn5zd8jpaa15a"; }; - buildInputs = [ cmake freetype libpng mesa gettext openssl perl libiconv qt5Full ]; + buildInputs = [ + cmake freetype libpng mesa gettext openssl perl libiconv qtscript + qtserialport qttools + ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c116ef927d37..b34fd62015dfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15689,7 +15689,7 @@ let spyder = pythonPackages.spyder; - stellarium = callPackage ../applications/science/astronomy/stellarium { }; + stellarium = qt5.callPackage ../applications/science/astronomy/stellarium { }; tulip = callPackage ../applications/science/misc/tulip { cmake = cmake-2_8; |