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

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
parent 71770e1f6f 9c64453ad8
commit 8bb312b3d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
pkgs/top-level/all-packages.nix
View File

@ -15592,7 +15592,9 @@ in
libpwquality = callPackage ../development/libraries/libpwquality { }; 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 { }; libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { };