home

commit ffd5ed1d584e8102c8a692e0069f1a6b63e890b7
parent 21f5ae951e4ce1233cd53f128ebe8b93466a452d
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Wed, 13 May 2020 16:56:34 +0200

pkgs/crc: fix crc + oc build…

Remove the use of `my` and pass oc_* to crc

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
pkgs/crc/default.nix
 | 
7
+++++--
M
pkgs/default.nix
 | 
2
+-

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/pkgs/crc/default.nix b/pkgs/crc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, buildGoModule, fetchFromGitHub, pkg-config, libvirt, podman, my }:
+{ stdenv, lib, buildGoPackage, buildGoModule, fetchFromGitHub, pkg-config, libvirt, podman, oc_4_4, oc_4_3 }:
 
 with lib;
 rec {
@@ -6,6 +6,7 @@ rec {
     { version
     , sha256
     , bundle
+    , oc
     }:
 
     buildGoPackage rec {
@@ -28,7 +29,7 @@ rec {
           -ldflags=
             -X ${t}/version.crcVersion=${version}
             -X ${t}/version.bundleVersion=${bundle}
-            -X ${t}/constants.OcBinaryName=${my.oc}/bin/oc
+            -X ${t}/constants.OcBinaryName=${oc}/bin/oc
             -X ${t}/constants.PodmanBinaryName=${podman}/bin/podman
             -X ${t}/machine/libvirt.MachineDriverCommand=${crc_driver_libvirt}/bin/machine-driver-libvirt
         '';
@@ -46,11 +47,13 @@ rec {
     version = "1.9.0";
     sha256 = "1q2jdm847snjj7wqchsik7qpczvx4awgi5rgvw930mm2b635r3aq";
     bundle = "4.3.10";
+    oc = oc_4_3;
   };
   crc_1_10 = makeOverridable crcGen {
     version = "1.10.0";
     sha256 = "11vy42zb2xzhwsgnz17894gfn03knvp2yr094k3zhly6wkxbwbk3";
     bundle = "4.4.3";
+    oc = oc_4_4;
   };
   crc_driver_libvirt = buildGoModule rec {
     pname = "crc_driver_libvirt";
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -44,7 +44,7 @@ rec {
   oc = oc_4_4;
   openshift-install = pkgs.callPackage ./openshift-install { };
 
-  inherit (pkgs.callPackage ./crc { })
+  inherit (pkgs.callPackage ./crc { oc_4_4 = oc_4_4; oc_4_3 = oc_4_3; })
     crc_1_9
     crc_1_10
     crc_driver_libvirt