From 1bedecb4f9178da2e50a9b14873e8186bc619e8a Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 22 Jul 2016 22:21:17 +0200 Subject: [PATCH 1/2] stellarium: wrap binary using `wrapQtProgram` Fixes #13582 where Stellarium segfaults when starting. --- .../applications/science/astronomy/stellarium/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 618a594c8cc..6959a6d73dc 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv -, qtscript, qtserialport, qttools +, qtscript, qtserialport, qttools, makeQtWrapper }: stdenv.mkDerivation rec { @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1xxil0rv61zc08znfv83cpsc47y1gjl2f3njhz0pn5zd8jpaa15a"; }; + nativeBuildInputs = [ makeQtWrapper ]; + buildInputs = [ cmake freetype libpng mesa gettext openssl perl libiconv qtscript qtserialport qttools @@ -17,6 +19,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + wrapQtProgram "$out/bin/stellarium" + ''; + meta = { description = "Free open-source planetarium"; homepage = "http://stellarium.org/"; From 1012508356abd1e24c39df813c89d27e948a4017 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 22 Jul 2016 22:43:52 +0200 Subject: [PATCH 2/2] stellarium: 0.14.2 -> 0.14.3 --- pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 6959a6d73dc..6f7d1b7b764 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "stellarium-0.14.2"; + name = "stellarium-0.14.3"; src = fetchurl { url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "1xxil0rv61zc08znfv83cpsc47y1gjl2f3njhz0pn5zd8jpaa15a"; + sha256 = "1919wzlvhfxdxficbwhp31xlhm0571grgcmsfdp5y36z9yqwahfy"; }; nativeBuildInputs = [ makeQtWrapper ];