diff options
| author | Lassulus <github@lassul.us> | 2023-08-14 20:34:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-14 20:34:03 +0200 |
| commit | 43fd3a94bb44205bcbf5f290b1990e5ab9c9699f (patch) | |
| tree | b1b82652c213aab0a512c9287b346baba7f0d984 | |
| parent | Merge pull request #242339 from hercules-ci/modules-catch-bare-type (diff) | |
| parent | pspp: 1.4.1 -> 1.6.2 (diff) | |
| download | nixpkgs-43fd3a94bb44205bcbf5f290b1990e5ab9c9699f.tar.gz | |
Merge pull request #245215 from idlip/pspp-bump
pspp: 1.4.1 -> 1.6.2
| -rw-r--r-- | pkgs/applications/science/math/pspp/default.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index dbc5c8a0f179..56f3fdcb1e40 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -1,23 +1,28 @@ { lib, stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl -, pkg-config, gtksourceview, pango, gettext, dconf +, pkg-config, gtksourceview4, pango, gettext, dconf , makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme -, texinfo, ssw, python3 +, texinfo, ssw, python3, iconv }: stdenv.mkDerivation rec { pname = "pspp"; - version = "1.4.1"; + version = "1.6.2"; src = fetchurl { url = "mirror://gnu/pspp/${pname}-${version}.tar.gz"; - sha256 = "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan"; + sha256 = "sha256-cylMovWy9/xBu/i3jFiIyAdfQ8YJf9SCq7BPhasIR7Y="; }; nativeBuildInputs = [ pkg-config texinfo python3 makeWrapper ]; buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl - gtksourceview pango gettext - gsettings-desktop-schemas hicolor-icon-theme ssw - ]; + gtksourceview4 pango gettext + gsettings-desktop-schemas hicolor-icon-theme ssw iconv + ]; + + C_INCLUDE_PATH = + "${libxml2.dev}/include/libxml2/:" + + lib.makeSearchPathOutput "dev" "include" buildInputs; + LIBRARY_PATH = lib.makeLibraryPath buildInputs; doCheck = false; |