Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: eb6337b3e3c0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 698ad2dd4db9
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 10, 2018

  1. nasc: 0.5.0 -> 0.5.1

    gebner committed Nov 10, 2018
    4
    Copy the full SHA
    698ad2d View commit details
Showing with 8 additions and 5 deletions.
  1. +8 −5 pkgs/applications/science/math/nasc/default.nix
13 changes: 8 additions & 5 deletions pkgs/applications/science/math/nasc/default.nix
Original file line number Diff line number Diff line change
@@ -6,32 +6,35 @@
, granite
, gnome3
, cmake
, ninja
, vala_0_40
, libqalculate
, gobjectIntrospection
, wrapGAppsHook }:

stdenv.mkDerivation rec {
name = "nasc-${version}";
version = "0.5.0";
version = "0.5.1";

src = fetchFromGitHub {
owner = "parnold-x";
repo = "nasc";
rev = version;
sha256 = "1rrp3djsv7lrgsqjn7x50msv0c5ffhz90lj1v11di0kp05m6q9j9";
sha256 = "13y5fnm7g3xgdxmdydlgly73nigh8maqbf9d6c9bpyzxkxq1csy5";
};

postPatch = ''
# libqalculatenasc.so is not installed, and nasc fails to start
substituteInPlace libqalculatenasc/CMakeLists.txt --replace SHARED STATIC
'';

nativeBuildInputs = [
pkgconfig
wrapGAppsHook
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
cmake
ninja
gobjectIntrospection # for setup-hook
];

buildInputs = [
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
gnome3.gtksourceview