Merge pull request #82815 from veprbl/pr/gnuplot_qt_darwin_fix

gnuplot_qt: fix on darwin
This commit is contained in:
Dmitry Kalinkin 2020-04-01 16:25:38 -04:00 committed by GitHub
commit b31f8d9b05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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;