1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00

nasc: 0.5.4 -> 0.7.5

* updates to meson build system
* adapt to complications around libqalculate
* update metadata
* add update script
This commit is contained in:
worldofpeace 2020-08-31 13:50:12 -04:00
parent a298b03505
commit 32a9e0eea7

View file

@ -1,7 +1,9 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pkgconfig , pkgconfig
, python3
, meson
, ninja
, vala , vala
, gtk3 , gtk3
, glib , glib
@ -9,52 +11,67 @@
, libsoup , libsoup
, gtksourceview , gtksourceview
, libgee , libgee
, cmake , nix-update-script
, webkitgtk
, libqalculate , libqalculate
, cln , intltool
, gnuplot
, wrapGAppsHook , wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nasc"; pname = "nasc";
version = "0.5.4"; version = "0.7.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "parnold-x"; owner = "parnold-x";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn"; sha256 = "kSRc5RLkI6SBJirUYw6swZi8IJhaL3y74b2Zw8kh2XA=";
fetchSubmodules = true;
}; };
patches = [
# fix build with gcc9
(fetchpatch {
url = "https://github.com/parnold-x/nasc/commit/46b9b80e228b6b86001bded45d85e073a9411549.patch";
sha256 = "1sm2aw0xhw2chk036r231nmp2f2ypxcmzggwljkn7wfzgg3h1mx3";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake glib # post_install.py
vala gtk3 # post_install.py
intltool # for libqalculate
meson
ninja
pkgconfig pkgconfig
python3
vala
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
cln
libsoup
gtk3
glib glib
gtk3
gtksourceview gtksourceview
libgee libgee
libqalculate
pantheon.elementary-icon-theme pantheon.elementary-icon-theme
pantheon.granite pantheon.granite
]; webkitgtk
# We add libqalculate's runtime dependencies because nasc has it as a modified subproject.
] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs;
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
# patch subproject. same code in libqalculate expression
substituteInPlace subprojects/libqalculate/libqalculate/Calculator-plot.cc \
--replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
--replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
'';
passthru = {
pdateScript = nix-update-script {
attrPath = pname;
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Do maths like a normal person"; description = "Do maths like a normal person, designed for elementary OS";
longDescription = '' longDescription = ''
Its an app where you do maths like a normal person. It lets you Its an app where you do maths like a normal person. It lets you
type whatever you want and smartly figures out what is math and type whatever you want and smartly figures out what is math and
@ -63,7 +80,7 @@ stdenv.mkDerivation rec {
the equations its used in. the equations its used in.
''; '';
homepage = "https://github.com/parnold-x/nasc"; homepage = "https://github.com/parnold-x/nasc";
maintainers = with maintainers; [ samdroid-apps ]; maintainers = pantheon.maintainers;
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
}; };