From 21e2088c1b6f5458f31fd368f416d45e4eb2bc5f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 4 Oct 2019 17:25:59 +0200
Subject: [PATCH] nix-perl -> nix.perl-bindings

---
 flake.nix | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index 220b6d8c5..0f8da30e2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -93,11 +93,11 @@
 
     in {
 
-      # A Nixpkgs overlay that overrides the 'nix' and 'nix-perl'
-      # packages.
+      # A Nixpkgs overlay that overrides the 'nix' and
+      # 'nix.perl-bindings' packages.
       overlay = final: prev: {
 
-        nix = with final; with commonDeps pkgs; releaseTools.nixBuild {
+        nix = with final; with commonDeps pkgs; (releaseTools.nixBuild {
           name = "nix";
           src = self.hydraJobs.tarball;
 
@@ -127,24 +127,26 @@
 
           doInstallCheck = true;
           installCheckFlags = "sysconfdir=$(out)/etc";
-        };
+        }) // {
 
-        nix-perl = with final; releaseTools.nixBuild {
-          name = "nix-perl";
-          src = self.hydraJobs.tarball;
+          perl-bindings = with final; releaseTools.nixBuild {
+            name = "nix-perl";
+            src = self.hydraJobs.tarball;
 
-          buildInputs =
-            [ nix curl bzip2 xz pkgconfig pkgs.perl boost ]
-            ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium;
+            buildInputs =
+              [ nix curl bzip2 xz pkgconfig pkgs.perl boost ]
+              ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium;
 
-          configureFlags = ''
-            --with-dbi=${perlPackages.DBI}/${pkgs.perl.libPrefix}
-            --with-dbd-sqlite=${perlPackages.DBDSQLite}/${pkgs.perl.libPrefix}
-          '';
+            configureFlags = ''
+              --with-dbi=${perlPackages.DBI}/${pkgs.perl.libPrefix}
+              --with-dbd-sqlite=${perlPackages.DBDSQLite}/${pkgs.perl.libPrefix}
+            '';
 
-          enableParallelBuilding = true;
+            enableParallelBuilding = true;
+
+            postUnpack = "sourceRoot=$sourceRoot/perl";
+          };
 
-          postUnpack = "sourceRoot=$sourceRoot/perl";
         };
 
       };
@@ -197,7 +199,7 @@
         build = nixpkgs.lib.genAttrs systems (system: nixpkgsFor.${system}.nix);
 
         # Perl bindings for various platforms.
-        perlBindings = nixpkgs.lib.genAttrs systems (system: nixpkgsFor.${system}.nix-perl);
+        perlBindings = nixpkgs.lib.genAttrs systems (system: nixpkgsFor.${system}.nix.perl-bindings);
 
         # Binary tarball for various platforms, containing a Nix store
         # with the closure of 'nix' package, and the second half of
@@ -429,7 +431,7 @@
       };
 
       packages = {
-        inherit (nixpkgsFor.x86_64-linux) nix nix-perl;
+        inherit (nixpkgsFor.x86_64-linux) nix;
       };
 
       defaultPackage = self.packages.nix;