From 95f4a0774406c279dd5cf3994705f746f766b1cb Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 26 Feb 2018 00:33:25 +0100
Subject: [PATCH] fix for nixops

See https://github.com/NixOS/nixops/issues/873
---
 bin/default.nix              | 22 ++++++++++++++++++++++
 bin/rb                       |  7 +++----
 profiles/desktop/default.nix |  2 --
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 bin/default.nix

diff --git a/bin/default.nix b/bin/default.nix
new file mode 100644
index 00000000..24b9e6c7
--- /dev/null
+++ b/bin/default.nix
@@ -0,0 +1,22 @@
+with import ../nixpkgs {};
+
+let
+  nixops = pkgs.nixops.overrideDerivation (
+    old: {
+      patchPhase = ''
+        substituteInPlace nix/eval-machine-info.nix \
+            --replace 'system.nixosVersion' 'system.nixos.version'
+      '';
+    }
+  );
+in
+
+runCommand "rb" {
+  buildInputs = [ makeWrapper ];
+} ''
+  mkdir -p $out/bin
+  substitute ${./rb} $out/bin/rb \
+    --subst-var-by nixops ${nixops}/bin/nixops
+
+  chmod +x $out/bin/rb
+''
diff --git a/bin/rb b/bin/rb
index 8086affd..69cf5716 100755
--- a/bin/rb
+++ b/bin/rb
@@ -1,5 +1,4 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p nixops git
+#!/usr/bin/env bash
 
 set -e
 
@@ -29,5 +28,5 @@ else
 	dirty=false
 fi
 
-sudo nixops set-args -d infinisil --arg dirty "$dirty"
-sudo nixops deploy -d infinisil $build $@
+sudo @nixops@ set-args -d infinisil --arg dirty "$dirty"
+sudo @nixops@ deploy -d infinisil $build $@
diff --git a/profiles/desktop/default.nix b/profiles/desktop/default.nix
index 885a6822..04918718 100644
--- a/profiles/desktop/default.nix
+++ b/profiles/desktop/default.nix
@@ -49,8 +49,6 @@
     #]))
   ];
 
-  environment.variables.PATH = "/cfg/bin";
-
   networking = {
     nameservers = [
       nodes.server.config.deployment.targetHost