public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #95998 from gebner/qalc3121

Browse Source
This commit is contained in:
Gabriel Ebner 2020-08-22 17:27:04 +02:00 committed by GitHub
commit 8518de5fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/science/math/qalculate-gtk/default.nix
View File

@ -2,17 +2,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qalculate-gtk"; pname = "qalculate-gtk";
version = "3.8.0a"; version = "3.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qalculate"; owner = "qalculate";
repo = "qalculate-gtk"; repo = "qalculate-gtk";
rev = "v${version}"; rev = "v${version}";
sha256 = "0bjd61bbc5b2i09kz3ss01c0xmxrhmiv5wpbhhplkp3yhw2qrf3m"; sha256 = "0ylsxj9rn3dc1grn9w6jisci3ak0hxgbwzqp54azs3aj5cmvkfgg";
}; };
patchPhase = '' patchPhase = ''
substituteInPlace src/main.cc --replace 'getPackageDataDir().c_str()' \"$out/share\" # https://github.com/Qalculate/qalculate-gtk/pull/178
substituteInPlace configure.ac --replace 'libxml-2.0' 'libxml-2.0 gio-unix-2.0'
''; '';
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

4
pkgs/development/libraries/libqalculate/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libqalculate"; pname = "libqalculate";
version = "3.8.0"; version = "3.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qalculate"; owner = "qalculate";
repo = "libqalculate"; repo = "libqalculate";
rev = "v${version}"; rev = "v${version}";
sha256 = "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df"; sha256 = "0g3ipl6ynhclmwny54zgdh721v0fs9dzj6j7r8dz91s86jva3chb";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];