summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorvolth <volth@webmaster.ms>2019-04-21 19:00:46 +0000
committerrnhmjoj <rnhmjoj@inventati.org>2021-03-31 21:35:38 +0200
commitbe6458dce36cce846fd9787bbfd4b01d5dcfc4cc (patch)
tree1c15055e938b4c515b3397242037a176ee646f7f /pkgs/tools/package-management
parent7d252394cc0554e7af33ee31126637e5354f2773 (diff)
downloadnixpkgs-be6458dce36cce846fd9787bbfd4b01d5dcfc4cc.tar
nixpkgs-be6458dce36cce846fd9787bbfd4b01d5dcfc4cc.tar.gz
nixpkgs-be6458dce36cce846fd9787bbfd4b01d5dcfc4cc.tar.bz2
nixpkgs-be6458dce36cce846fd9787bbfd4b01d5dcfc4cc.tar.lz
nixpkgs-be6458dce36cce846fd9787bbfd4b01d5dcfc4cc.tar.xz
nixpkgs-be6458dce36cce846fd9787bbfd4b01d5dcfc4cc.tar.zst
nixpkgs-be6458dce36cce846fd9787bbfd4b01d5dcfc4cc.zip
nix.perl-bindings: add passthru.perlModule
... so it can be used in `perl.withPackages`
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/nix/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 4a8cd9a1c62..8b7406e92d0 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -11,7 +11,7 @@ let
 common =
   { lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz
   , bash, coreutils, util-linuxMinimal, gzip, gnutar
-  , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
+  , pkg-config, boehmgc, libsodium, brotli, boost, editline, nlohmann_json
   , autoreconfHook, autoconf-archive, bison, flex
   , jq, libarchive, libcpuid
   , lowdown, mdbook
@@ -165,7 +165,7 @@ common =
       };
 
       passthru = {
-        perl-bindings = stdenv.mkDerivation {
+        perl-bindings = perl.pkgs.toPerlModule (stdenv.mkDerivation {
           pname = "nix-perl";
           inherit version;
 
@@ -179,14 +179,14 @@ common =
             [ perl pkg-config curl nix libsodium boost autoreconfHook autoconf-archive nlohmann_json ];
 
           configureFlags =
-            [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
-              "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
+            [ "--with-dbi=${perl.pkgs.DBI}/${perl.libPrefix}"
+              "--with-dbd-sqlite=${perl.pkgs.DBDSQLite}/${perl.libPrefix}"
             ];
 
           preConfigure = "export NIX_STATE_DIR=$TMPDIR";
 
           preBuild = "unset NIX_INDENT_MAKE";
-        };
+        });
       };
     };
   in nix;