summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrik Strid <ulrik.strid@outlook.com>2023-03-28 16:17:52 +0200
committerUlrik Strid <ulrik.strid@outlook.com>2023-03-28 16:17:52 +0200
commit5a8991c6b34fc62793f3996cb4614595d5d13a6c (patch)
tree82d4b5f79803899ebb9735f99fcd408349a8541c
parent8d8ff060aef76ea40b1f8aabca8b52289ae57f7e (diff)
downloadnixpkgs-5a8991c6b34fc62793f3996cb4614595d5d13a6c.tar
nixpkgs-5a8991c6b34fc62793f3996cb4614595d5d13a6c.tar.gz
nixpkgs-5a8991c6b34fc62793f3996cb4614595d5d13a6c.tar.bz2
nixpkgs-5a8991c6b34fc62793f3996cb4614595d5d13a6c.tar.lz
nixpkgs-5a8991c6b34fc62793f3996cb4614595d5d13a6c.tar.xz
nixpkgs-5a8991c6b34fc62793f3996cb4614595d5d13a6c.tar.zst
nixpkgs-5a8991c6b34fc62793f3996cb4614595d5d13a6c.zip
Fix dune-configurator
-rw-r--r--pkgs/development/ocaml-modules/dune-configurator/default.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix
index f5303db9a3b..862e0d01d59 100644
--- a/pkgs/development/ocaml-modules/dune-configurator/default.nix
+++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix
@@ -1,17 +1,21 @@
-{ lib, buildDunePackage, dune_2, csexp, result }:
+{ lib, buildDunePackage, dune_3, csexp }:
 
 buildDunePackage rec {
   pname = "dune-configurator";
 
-  useDune2 = true;
+  inherit (dune_3) src version;
 
-  inherit (dune_2) src version patches;
+  # This fixes finding csexp
+  postPatch = ''
+    rm -rf ./vendor
+  '';
 
-  minimumOCamlVersion = "4.03";
+  minimumOCamlVersion = "4.04";
 
+  duneVersion = "3";
   dontAddPrefix = true;
 
-  propagatedBuildInputs = [ csexp result ];
+  propagatedBuildInputs = [ csexp ];
 
   meta = with lib; {
     description = "Helper library for gathering system configuration";