diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9238045ec49..af8aec8cb98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2103,19 +2103,15 @@ let pal = callPackage ../tools/misc/pal { }; - pandoc = with haskellPackages; pandoc.override { - cabal = cabal.override { - extension = self: super: { - configureFlags = super.configureFlags or "" + " -fembed_data_files"; - buildTools = super.buildTools or [] ++ [hsb2hs]; - enableSharedExecutables = false; - enableSharedLibraries = false; - isLibrary = false; - noHaddock = true; - postFixup = "rm -rf $out/lib $out/nix-support $out/share"; - }; - }; - }; + pandoc = haskell-ng.lib.overrideCabal haskellngPackages.pandoc (drv: { + configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; + buildTools = drv.buildTools or [] ++ [haskellngPackages.hsb2hs]; + enableSharedExecutables = false; + enableSharedLibraries = false; + isLibrary = false; + doHaddock = false; + postFixup = "rm -rf $out/lib $out/nix-support $out/share"; + }); panomatic = callPackage ../tools/graphics/panomatic { };