diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-02-02 19:34:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 19:34:18 +0100 |
| commit | 6d788e9063a5aaef197fc6cdb31e8d903d8c2218 (patch) | |
| tree | 122d20ac6ba7e9ff9bb7bd231ad52d7a1b72ac46 | |
| parent | 1c89f92fbde6819b68fec3c7763518f8f37afd7b (diff) | |
| parent | 25225f0b4646f0353e079d0b19739494d63f249f (diff) | |
| download | nixlib-6d788e9063a5aaef197fc6cdb31e8d903d8c2218.tar nixlib-6d788e9063a5aaef197fc6cdb31e8d903d8c2218.tar.gz nixlib-6d788e9063a5aaef197fc6cdb31e8d903d8c2218.tar.bz2 nixlib-6d788e9063a5aaef197fc6cdb31e8d903d8c2218.tar.lz nixlib-6d788e9063a5aaef197fc6cdb31e8d903d8c2218.tar.xz nixlib-6d788e9063a5aaef197fc6cdb31e8d903d8c2218.tar.zst nixlib-6d788e9063a5aaef197fc6cdb31e8d903d8c2218.zip | |
Merge pull request #34514 from acowley/libqalculate-clang
libqalculate: fix build with clang
| -rw-r--r-- | pkgs/development/libraries/libqalculate/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 0e67f970b763..89b71c1855da 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { substituteInPlace libqalculate/Calculator.cc \ --replace 'commandline = "gnuplot"' 'commandline = "${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 = '' |