diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-07-18 14:55:23 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-07-18 15:38:52 +0200 |
| commit | a4443ef85914ed14e03b89595451a4df717cf5df (patch) | |
| tree | 4e7df1edc98c505989dc8ff38aac8214fa9d5183 /pkgs | |
| parent | c21b6930bd88e21a391604fbd495829d46189c22 (diff) | |
| download | nixpkgs-a4443ef85914ed14e03b89595451a4df717cf5df.tar nixpkgs-a4443ef85914ed14e03b89595451a4df717cf5df.tar.gz nixpkgs-a4443ef85914ed14e03b89595451a4df717cf5df.tar.bz2 nixpkgs-a4443ef85914ed14e03b89595451a4df717cf5df.tar.lz nixpkgs-a4443ef85914ed14e03b89595451a4df717cf5df.tar.xz nixpkgs-a4443ef85914ed14e03b89595451a4df717cf5df.tar.zst nixpkgs-a4443ef85914ed14e03b89595451a4df717cf5df.zip | |
nasc: 0.4.6 → 0.4.7
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/math/nasc/default.nix | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 8efe8d9da94..cac403b131b 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -1,8 +1,6 @@ { stdenv -, bash -, gnused , fetchFromGitHub -, gettext +, fetchpatch , pkgconfig , gtk3 , granite @@ -11,23 +9,30 @@ , ninja , vala , libqalculate -, elementary-cmake-modules +, gobjectIntrospection , wrapGAppsHook }: stdenv.mkDerivation rec { name = "nasc-${version}"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "parnold-x"; repo = "nasc"; rev = version; - sha256 = "01n4ldj5phrsv97vb04qvs9c1ip6v8wygx9llj704hly1il9fb54"; + sha256 = "0p74953pdgsijvqj3msssqiwm6sc1hzp68dlmjamqrqirwgqv5aa"; }; - XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ - "${granite}/share" - "${gnome3.libgee}/share" + patches = [ + # Install libqalculatenasc.so + (fetchpatch { + url = https://github.com/parnold-x/nasc/commit/93a799f9afb3e32f3f1a54e056b59570aae2e437.patch; + sha256 = "1m32w2zaswzxnzbr7p3lf8s6fac4mjvfhm8v9k59b4jyzmvrl631"; + }) + (fetchpatch { + url = https://github.com/parnold-x/nasc/commit/570b49169326de154af2cf43c5f12268fff1dc6d.patch; + sha256 = "1y3w6rxn0453iscx2xg427wy1bd5kv4z1c41hhbjmg614ycp6bka"; + }) ]; nativeBuildInputs = [ @@ -35,7 +40,8 @@ stdenv.mkDerivation rec { wrapGAppsHook vala cmake - gettext + ninja + gobjectIntrospection # for setup-hook ]; buildInputs = [ libqalculate @@ -46,14 +52,6 @@ stdenv.mkDerivation rec { gnome3.gtksourceview ]; - prePatch = '' - substituteInPlace ./libqalculatenasc/libtool \ - --replace "/bin/bash" "${bash}/bin/bash" \ - --replace "/bin/sed" "${gnused}/bin/sed" - substituteInPlace ./libqalculatenasc/configure.inc \ - --replace 'ac_default_path="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"' 'ac_default_path=$PATH' - ''; - meta = with stdenv.lib; { description = "Do maths like a normal person"; longDescription = '' |