From cc73868d14f7b75e599b33b728c7946d66f5260f Mon Sep 17 00:00:00 2001
From: Quentin Aristote <quentin@aristote.fr>
Date: Mon, 6 Dec 2021 12:15:51 +0100
Subject: remove quoting around nix paths cast to strings

---
 modules/ocaml.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/ocaml.nix b/modules/ocaml.nix
index 748e2ec..661436a 100644
--- a/modules/ocaml.nix
+++ b/modules/ocaml.nix
@@ -16,6 +16,9 @@ let
     ++ userPackages;
 
   stdlibDir = "${cfg.ocamlPackages.findlib}/lib/ocaml/${cfg.version}/site-lib";
+  parseOcamlDrvName = with builtins;
+    pkg:
+    head (match "ocaml${cfg.version}-(.*)" (parseDrvName pkg.name).name);
   ocamlInit = pkgs.writeText "ocamlinit" (
     # load libs
     (concatStringsSep "\n" (map (dir: ''
@@ -30,7 +33,8 @@ let
     + (optionalString cfg.toplevel.list "#list;;")
     # require packages
     + (concatStringsSep "\n"
-      (map (pkg: ''# require "${pkg.pname}";;'') userPackages))
+      (map (pkg: ''# require "${parseOcamlDrvName pkg}";;'')
+        userPackages))
     # additional init commands
     + cfg.toplevel.extraInit
 
-- 
cgit v1.2.3