diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-05 18:37:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-05 18:37:53 +0100 |
| commit | 8bb312b3d2e13e07ea6903ac661148cb600bc62a (patch) | |
| tree | cd0f046f62c086ecdadbd4afee16185cf405bc65 | |
| parent | 71770e1f6f52a274d8cee932ecae9bf3ec9bc69e (diff) | |
| parent | 9c64453ad86a530d47e6d91d11695065b0dc7c63 (diff) | |
| download | nixpkgs-8bb312b3d2e13e07ea6903ac661148cb600bc62a.tar nixpkgs-8bb312b3d2e13e07ea6903ac661148cb600bc62a.tar.gz nixpkgs-8bb312b3d2e13e07ea6903ac661148cb600bc62a.tar.bz2 nixpkgs-8bb312b3d2e13e07ea6903ac661148cb600bc62a.tar.lz nixpkgs-8bb312b3d2e13e07ea6903ac661148cb600bc62a.tar.xz nixpkgs-8bb312b3d2e13e07ea6903ac661148cb600bc62a.tar.zst nixpkgs-8bb312b3d2e13e07ea6903ac661148cb600bc62a.zip | |
Merge pull request #115201 from acowley/libqalculate-readline
libqalculate: build with readline80
| -rw-r--r-- | pkgs/development/libraries/libqalculate/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 8bd187b5300..e55cda51748 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21d2cdc9c69..400d4e3a8f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |