Explicit pkg-config

input-output-hk · Sep 4, 2022 · 2611a66 · 2611a66
1 parent a17863c
commit 2611a66
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/lib/call-cabal-project-to-nix.nix b/lib/call-cabal-project-to-nix.nix
@@ -66,6 +66,7 @@ in
                             # any plutus-apps input being used for a
                             # package.
 , evalPackages
+, pkgconfSelector ? (_: [])
 , ...
 }@args:
 
@@ -167,6 +168,8 @@ let
 
   index-state-pinned = index-state != null || cabalProjectIndexState != null;
 
+  pkgconfPkgs = import ./pkgconf-nixpkgs-map.nix pkgs;
+
 in
   assert (if index-state-found == null
     then throw "No index state passed and none found in ${cabalProjectFileName}" else true);
@@ -463,7 +466,8 @@ let
   } // pkgs.lib.optionalAttrs (checkMaterialization != null) {
     inherit checkMaterialization;
   }) (evalPackages.runCommand (nameAndSuffix "plan-to-nix-pkgs") {
-    nativeBuildInputs = [ nix-tools dummy-ghc dummy-ghc-pkg cabal-install evalPackages.rsync evalPackages.gitMinimal ];
+    nativeBuildInputs = [ nix-tools dummy-ghc dummy-ghc-pkg cabal-install evalPackages.rsync evalPackages.gitMinimal evalPackages.pkgconfig ];
+    buildInputs = pkgconfSelector pkgconfPkgs;
     # Needed or stack-to-nix will die on unicode inputs
     LOCALE_ARCHIVE = pkgs.lib.optionalString (evalPackages.stdenv.buildPlatform.libc == "glibc") "${evalPackages.glibcLocales}/lib/locale/locale-archive";
     LANG = "en_US.UTF-8";

diff --git a/lib/pkgconf-nixpkgs-map.nix b/lib/pkgconf-nixpkgs-map.nix
@@ -143,7 +143,8 @@ pkgs:
     "sctp"                               = [ pkgs."lksctp-tools" ]; # This is linux-specific, we should create a common attribute if we ever add sctp support for other systems.
     "sdl2"                               = [ pkgs."SDL2" ];
     "sndfile"                            = [ pkgs."libsndfile" ];
-    "sodium"                             = [ pkgs."libsodium" ];
+    "sodium"                             = [ pkgs."libsodium".dev ];
+    "libsodium"                          = [ pkgs."libsodium".dev ];
     "sqlite3"                            = [ pkgs."sqlite" ];
     "ssh2"                               = [ pkgs."libssh2" ];
     "statgrab"                           = [ pkgs."libstatgrab" ];

diff --git a/modules/cabal-project.nix b/modules/cabal-project.nix
@@ -130,5 +130,9 @@ in {
       type = nullOr (listOf unspecified);
       default = [];
     };
+    pkgconfSelector = mkOption {
+      type = unspecified;
+      default = (_: []);
+    };
   };
 }
diff --git a/test/exe-dlls/default.nix b/test/exe-dlls/default.nix
@@ -7,6 +7,7 @@ let
   project = project' {
     inherit compiler-nix-name evalPackages;
     src = testSrc "exe-dlls";
+    pkgconfSelector = p: [p.libsodium];
   };
 
   packages = project.hsPkgs;

diff --git a/test/exe-lib-dlls/default.nix b/test/exe-lib-dlls/default.nix
@@ -7,6 +7,7 @@ let
   project = project' {
     inherit compiler-nix-name evalPackages;
     src = testSrc "exe-lib-dlls";
+    pkgconfSelector = p: [p.libsodium];
   };
 
   packages = project.hsPkgs;

diff --git a/test/th-dlls/default.nix b/test/th-dlls/default.nix
@@ -7,6 +7,7 @@ let
   project = project' {
     inherit compiler-nix-name evalPackages;
     src = testSrc "th-dlls";
+    pkgconfSelector = p: [p.libsodium];
   };
 
   packages = project.hsPkgs;