From 7e48ecc0c00086455268960b6bc444efb4320821 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Thu, 21 Jul 2016 16:19:11 +0300
Subject: Merge nixpkgs.config.perlPackageOverrides

---
 nixos/modules/misc/nixpkgs.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'nixos/modules/misc/nixpkgs.nix')

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 5eb38c510b4..7d50b8025bd 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -21,6 +21,11 @@ let
       packageOverrides = pkgs:
         optCall lhs.packageOverrides pkgs //
         optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
+    } //
+    optionalAttrs (lhs ? perlPackageOverrides) {
+      perlPackageOverrides = pkgs:
+        optCall lhs.perlPackageOverrides pkgs //
+        optCall (attrByPath ["perlPackageOverrides"] ({}) rhs) pkgs;
     };
 
   configType = mkOptionType {
-- 
cgit 1.4.1