diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-04-01 16:25:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-01 16:25:38 -0400 |
| commit | b31f8d9b0576ec2c71698a91c3ae86f5cfad467d (patch) | |
| tree | f5caf6f2997157c01e066406c383e21f43089c58 /pkgs/tools/graphics | |
| parent | efae68aa495f84517140b5daa2970712ecde0bbc (diff) | |
| parent | c0f2b7e289b54b4f8e590a230f546a766068687c (diff) | |
| download | nixlib-b31f8d9b0576ec2c71698a91c3ae86f5cfad467d.tar nixlib-b31f8d9b0576ec2c71698a91c3ae86f5cfad467d.tar.gz nixlib-b31f8d9b0576ec2c71698a91c3ae86f5cfad467d.tar.bz2 nixlib-b31f8d9b0576ec2c71698a91c3ae86f5cfad467d.tar.lz nixlib-b31f8d9b0576ec2c71698a91c3ae86f5cfad467d.tar.xz nixlib-b31f8d9b0576ec2c71698a91c3ae86f5cfad467d.tar.zst nixlib-b31f8d9b0576ec2c71698a91c3ae86f5cfad467d.zip | |
Merge pull request #82815 from veprbl/pr/gnuplot_qt_darwin_fix
gnuplot_qt: fix on darwin
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 0ac1c1a21553..c04101575c73 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -48,12 +48,16 @@ in (if aquaterm then "--with-aquaterm" else "--without-aquaterm") ]; + CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11"; + postInstall = lib.optionalString withX '' wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ --prefix PATH : '${coreutils}/bin' \ --prefix PATH : '${fontconfig.bin}/bin' \ --run '. ${./set-gdfontpath-from-fontconfig.sh}' + '' + lib.optionalString (stdenv.isDarwin && withQt) '' + wrapQtApp $out/bin/gnuplot ''; enableParallelBuilding = true; |