From f9c33c375e3afae596972d1a69dadad9f22d7f39 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 16 Mar 2019 14:43:16 +0100
Subject: [PATCH] docker-compose: move condition to package

make the default.nix self-sufficient
---
 docker-compose/default.nix | 9 +++++++--
 overlay.nix                | 8 +-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/docker-compose/default.nix b/docker-compose/default.nix
index 6751321..1ca1665 100644
--- a/docker-compose/default.nix
+++ b/docker-compose/default.nix
@@ -1,6 +1,11 @@
 { buildCLIImage
-, docker-compose
+, docker-compose ? null
+, python3Packages
 }:
 buildCLIImage {
-  drv = docker-compose;
+  drv =
+    if docker-compose == null
+    then python3Packages.docker_compose
+    else docker-compose # nixos 19.03+
+    ;
 }
diff --git a/overlay.nix b/overlay.nix
index 49ad27d..6e61274 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -8,13 +8,7 @@ _: pkgs: {
     bash = pkgs.callPackage ./bash {};
     busybox = pkgs.callPackage ./busybox {};
     curl = pkgs.callPackage ./curl {};
-    docker-compose = pkgs.callPackage ./docker-compose {
-      docker-compose =
-         # master
-         pkgs.docker-compose or
-         # 18.09 or later
-         pkgs.python3Packages.docker_compose;
-    };
+    docker-compose = pkgs.callPackage ./docker-compose {};
     kubectl = pkgs.callPackage ./kubectl {};
     kubernetes-helm = pkgs.callPackage ./kubernetes-helm {};
     nix = pkgs.callPackage ./nix {};