git.iko.soy/typeable/nixpkgs
on master help sign in
minishift: add openshift input

minishift depdends on oc to control the openshift installation.

commit08c3c0094aa6492d1ba396f15201ab1ae00b588f authorChristian Albrecht <christian.albrecht@mayflower.de> dateFri 16 Nov 2018, 23:18 (8 years ago) parentd59307e
1 file changed+7−2
pkgs/applications/networking/cluster/minishift/default.nix+7−2
pkgs/applications/networking/cluster/minishift/default.nix+7−2
@@ -1,5 +1,5 @@
11{ lib, buildGoPackage, fetchFromGitHub, go-bindata, pkgconfig, makeWrapper
2−, glib, gtk3, libappindicator-gtk3, gpgme, ostree, libselinux, btrfs-progs
2+, glib, gtk3, libappindicator-gtk3, gpgme, openshift, ostree, libselinux, btrfs-progs
33, lvm2, docker-machine-kvm
44}:
55
@@ -31,6 +31,11 @@ in buildGoPackage rec {
3131 postPatch = ''
3232 substituteInPlace vendor/github.com/containers/image/storage/storage_image.go \
3333 --replace 'nil, diff' 'diff'
34+
35+ # minishift downloads openshift if not found therefore set the cache to /nix/store/...
36+ substituteInPlace pkg/minishift/cache/oc_caching.go \
37+ --replace 'filepath.Join(oc.MinishiftCacheDir, OC_CACHE_DIR, oc.OpenShiftVersion, runtime.GOOS)' '"${openshift}/bin"' \
38+ --replace '"runtime"' ""
3439 '';
3540
3641 buildFlagsArray = ''
@@ -49,7 +54,7 @@ in buildGoPackage rec {
4954
5055 postInstall = ''
5156 wrapProgram "$bin/bin/minishift" \
52− --prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm ]}'
57+ --prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm openshift ]}'
5358 '';
5459
5560 meta = with lib; {