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

Merge pull request #58163 from dtzWill/update/qalculate-3

Browse Source 
libqalculate,qalculate-gtk: 2.9.0 -> 3.0.0
This commit is contained in:
Gabriel Ebner 2019-03-23 18:50:24 +01:00 committed by GitHub
commit 4446452347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: { stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qalculate-gtk-${version}"; pname = "qalculate-gtk";
version = "2.9.0"; version = "3.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qalculate"; owner = "qalculate";
repo = "qalculate-gtk"; repo = "qalculate-gtk";
rev = "v${version}"; rev = "v${version}";
sha256 = "0c5s7mz8xwwmzc22yai8vqiww7paafkyi7khp8a2yws78m2nirdx"; sha256 = "00q6y9dgg9wgpgks79snbipn8alfjajlx02a5hm7wl9a20zd0b81";
}; };
patchPhase = '' patchPhase = ''

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

@ -2,14 +2,14 @@
autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }: autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libqalculate-${version}"; pname = "libqalculate";
version = "2.9.0"; version = "3.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qalculate"; owner = "qalculate";
repo = "libqalculate"; repo = "libqalculate";
rev = "v${version}"; rev = "v${version}";
sha256 = "1w4fbcc6hh63dp88fy4wvys6i1ydj7ya50r1l69a64qbzby1w32i"; sha256 = "0i21c92r94mp03673cvngvqph268ir4j89d5s9qzxgq2zjw5pc8q";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
substituteInPlace libqalculate/Calculator.cc \ substituteInPlace libqalculate/Calculator.cc \
--replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \ --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
--replace '"gnuplot -"' '"${gnuplot}/bin/gnuplot -"' --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
'' + stdenv.lib.optionalString stdenv.cc.isClang '' '' + stdenv.lib.optionalString stdenv.cc.isClang ''
substituteInPlace src/qalc.cc \ substituteInPlace src/qalc.cc \
--replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))' --replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))'