Merge pull request #59 from MangoIV/mangoiv/remove-perl-override

[chore] bump and remove cabal-install override of groff
MangoIV · Oct 23, 2024 · ed4bf6d · ed4bf6d
2 parents 0e05362 + 426aa2b
commit ed4bf6d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 33 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nix/static.nix b/nix/static.nix
@@ -1,10 +1,7 @@
 {
-  groff,
   haskell,
   haskellPackages,
   lib,
-  makeWrapper,
-  perl536,
   upx,
   ...
 }: let
@@ -17,30 +14,11 @@
         Cabal-syntax = hsuper.Cabal-syntax_3_10_3_0;
         Cabal = hsuper.Cabal_3_10_3_0;
         cabal-install-solver = hself.callHackage "cabal-install-solver" "3.10.3.0" {};
-        cabal-install =
-          hlib.overrideCabal {
-            postInstall = let
-              groffOldPerl = groff.override {
-                # perl 538 doesn't build in pkgsStatic at the moment
-                # https://github.com/NixOS/nixpkgs/issues/295608
-                perl = perl536;
-              };
-            in ''
-              mkdir -p "$out/share/man/man1"
-              "$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1"
-
-              wrapProgram "$out/bin/cabal" \
-                --prefix PATH : "${lib.makeBinPath [groffOldPerl]}"
-            '';
-          }
-          ((hself.callHackage "cabal-install" "3.10.3.0" {
-              Cabal-QuickCheck = null;
-              Cabal-described = null;
-              Cabal-tree-diff = null;
-            })
-            .overrideAttrs (old: {
-              nativeBuildInputs = old.nativeBuildInputs or [] ++ [makeWrapper];
-            }));
+        cabal-install = hself.callHackage "cabal-install" "3.10.3.0" {
+          Cabal-QuickCheck = null;
+          Cabal-described = null;
+          Cabal-tree-diff = null;
+        };
       });
   };
 in