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

Merge pull request #34514 from acowley/libqalculate-clang

Browse Source 
libqalculate: fix build with clang
This commit is contained in:
Daiderd Jordan 2018-02-02 19:34:18 +01:00 committed by GitHub
commit 6d788e9063
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,9 @@ stdenv.mkDerivation rec {
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 ''
substituteInPlace src/qalc.cc \
--replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))'
''; '';
preBuild = '' preBuild = ''