diff options
author | maralorn <mail@maralorn.de> | 2023-11-08 15:46:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-08 15:46:24 +0100 |
commit | 617c28cfd63b11980a90da61692e3c2b7afcdee1 (patch) | |
tree | d96ba1f557885e00596825ef49701efa87371a70 /pkgs/development/tools | |
parent | 8ee65b173af7bdf64a4212a7d3327236cc2ab4c4 (diff) | |
parent | c634dae2798046a6d27734e708c83909b359eb59 (diff) |
Merge pull request #249970 from sternenseemann/pandoc-version-match-lib
pandoc: use library's version
Diffstat (limited to 'pkgs/development/tools')
-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 1e9eec3f804c8..528a1b3f53555 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 ]; |