summary refs log tree commit diff
path: root/pkgs/applications/science/math/nasc/default.nix
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2019-03-20 22:53:41 -0400
committerworldofpeace <worldofpeace@users.noreply.github.com>2019-03-20 23:10:33 -0400
commit035396795789d8eed66b4388b7aa8043da7cb193 (patch)
tree73908892b22b223960a59283d5627bae2c06fc8d /pkgs/applications/science/math/nasc/default.nix
parentb40587cb55181440afdf5cae4679eef427f03deb (diff)
downloadnixpkgs-035396795789d8eed66b4388b7aa8043da7cb193.tar
nixpkgs-035396795789d8eed66b4388b7aa8043da7cb193.tar.gz
nixpkgs-035396795789d8eed66b4388b7aa8043da7cb193.tar.bz2
nixpkgs-035396795789d8eed66b4388b7aa8043da7cb193.tar.lz
nixpkgs-035396795789d8eed66b4388b7aa8043da7cb193.tar.xz
nixpkgs-035396795789d8eed66b4388b7aa8043da7cb193.tar.zst
nixpkgs-035396795789d8eed66b4388b7aa8043da7cb193.zip
nasc: 0.5.1 -> 0.5.2
Main improvment is that libqalculatenasc.so is now properly linked

Changelog: https://github.com/parnold-x/nasc/compare/0.5.1...0.5.2
Diffstat (limited to 'pkgs/applications/science/math/nasc/default.nix')
-rw-r--r--pkgs/applications/science/math/nasc/default.nix32
1 files changed, 15 insertions, 17 deletions
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
index aef18abaedf..beed2de9759 100644
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -2,47 +2,45 @@
 , fetchFromGitHub
 , pkgconfig
 , gtk3
+, glib
 , pantheon
-, gnome3
+, libsoup
 , gtksourceview
 , libgee
 , cmake
 , libqalculate
-, gobject-introspection
-, wrapGAppsHook }:
+, cln
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
-  name = "nasc-${version}";
-  version = "0.5.1";
+  pname = "nasc";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "parnold-x";
-    repo = "nasc";
+    repo = pname;
     rev = version;
-    sha256 = "13y5fnm7g3xgdxmdydlgly73nigh8maqbf9d6c9bpyzxkxq1csy5";
+    sha256 = "009xmlsgl7r6wp6sczbdp8sjqqd6k2mychx5b4zn7wnrl7435y5y";
   };
 
-  postPatch = ''
-    # libqalculatenasc.so is not installed, and nasc fails to start
-    substituteInPlace libqalculatenasc/CMakeLists.txt --replace SHARED STATIC
-  '';
-
   nativeBuildInputs = [
     cmake
     pantheon.vala
-    gobject-introspection # for setup-hook
     pkgconfig
     wrapGAppsHook
   ];
 
   buildInputs = [
-    pantheon.elementary-icon-theme
+    cln
+    libsoup
+    gtk3
+    glib
     gtksourceview
     libgee
-    gnome3.libsoup
-    pantheon.granite
-    gtk3
     libqalculate
+    pantheon.elementary-icon-theme
+    pantheon.granite
   ];
 
   meta = with stdenv.lib; {