diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-08-18 16:38:01 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-08-18 16:38:55 +0200 |
commit | c634dae2798046a6d27734e708c83909b359eb59 (patch) | |
tree | e27716a0e0e73480180ec993d4e27ae8bf244cda /pkgs/development/tools/pandoc/default.nix | |
parent | 3be1e25615f95b05405f8c9183390dca3454a407 (diff) | |
download | nixpkgs-c634dae2798046a6d27734e708c83909b359eb59.tar nixpkgs-c634dae2798046a6d27734e708c83909b359eb59.tar.gz nixpkgs-c634dae2798046a6d27734e708c83909b359eb59.tar.bz2 nixpkgs-c634dae2798046a6d27734e708c83909b359eb59.tar.lz nixpkgs-c634dae2798046a6d27734e708c83909b359eb59.tar.xz nixpkgs-c634dae2798046a6d27734e708c83909b359eb59.tar.zst nixpkgs-c634dae2798046a6d27734e708c83909b359eb59.zip |
pandoc: use library's version
Since pandoc --version reports this, it makes the whole affair less counter intuitive. Also one step towards #249946.
Diffstat (limited to 'pkgs/development/tools/pandoc/default.nix')
-rw-r--r-- | pkgs/development/tools/pandoc/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index 1e9eec3f804..528a1b3f535 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -6,6 +6,15 @@ let in (haskell.lib.compose.overrideCabal (drv: { + # pandoc-cli's pandoc executable report the libraries version via --version, match that, + inherit (static.scope.pandoc) version; + # but prevent haskellPackages.mkDerivation from recomputing the src tarball based on that. + inherit (static) src; + # Make it possible to recover the cli version if necessary. + passthru = drv.passthru or {} // { + cliVersion = static.version; + }; + configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; |