Merge pull request #115201 from acowley/libqalculate-readline

libqalculate: build with readline80
This commit is contained in:
Sandro 2021-03-05 18:37:53 +01:00 committed by GitHub
commit 8bb312b3d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View file

@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ];
buildInputs = [ curl gettext libiconv readline ];
configureFlags = ["--with-readline=${readline.dev}"];
propagatedBuildInputs = [ libxml2 mpfr icu ];
enableParallelBuilding = true;

View file

@ -15592,7 +15592,9 @@ in
libpwquality = callPackage ../development/libraries/libpwquality { };
libqalculate = callPackage ../development/libraries/libqalculate { };
libqalculate = callPackage ../development/libraries/libqalculate {
readline = readline80;
};
libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { };