1 files changed, 37 insertions, 14 deletions

diff --git a/clever-tools/default.nix b/clever-tools/default.nix
index 6c729a5..9ac69e6 100644
--- a/clever-tools/default.nix
+++ b/clever-tools/default.nix
@@ -1,36 +1,59 @@
-{ stdenv, fetchurl, glibc, nodegit }:
+{ stdenv, fetchurl, glibc }:
 
 stdenv.mkDerivation rec {
   name = "clever-tools-${version}";
-  version = "0.9.3";
+  version = "1.1.0";
 
   src = fetchurl {
     url = "https://clever-tools.cellar.services.clever-cloud.com/releases/${version}/clever-tools-${version}_linux.tar.gz";
-    sha256 = "adcae5af912dcbdc74d996b6e94767f24d16bf1bdcd5073797f999fe75b018a4";
+    sha256 = "1lkwckmlz2gf41xmnzydpcbly0jcry3bn8lp570gha768ic7xmb1";
   };
 
-  buildInputs = [ nodegit ];
-
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc glibc ];
 
-  nodegitLibrary = stdenv.lib.makeLibraryPath [ nodegit ];
-
   installPhase = ''
-    tar --extract --file=$src linux/clever --transform 's/linux\///'
+    tar --extract --file=$src
     bin=$out/bin/clever
     mkdir -p $out/bin
     mv clever $bin
-    ln -s "$nodegitLibrary/nodegit.node" "$out/bin/nodegit.node"
   '';
 
   dontStrip = "true";
 
+  # See https://github.com/brendan-hall/nixpkgs/blob/e3b313bb59f49f10970205aafd44878d35da07e7/pkgs/development/web/now-cli/default.nix#L25
+  # There is no helper in nixpkgs lib right now
+  # The algorithm for zeit/pkg fix is given https://github.com/NixOS/nixpkgs/pull/48193
+  # it has been used for Unity3D as well https://github.com/NixOS/nixpkgs/pull/48643
   preFixup = ''
     bin=$out/bin/clever
-    patchelf \
-      --set-rpath "$libPath" \
-      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      "$bin"
+    orig_size=$(stat --printf=%s $bin)
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $bin
+    patchelf --set-rpath ${libPath} $bin
+    new_size=$(stat --printf=%s $bin)
+    ###### zeit-pkg fixing starts here.
+    # we're replacing plaintext js code that looks like
+    # PAYLOAD_POSITION = '1234                  ' | 0
+    # [...]
+    # PRELUDE_POSITION = '1234                  ' | 0
+    # ^-----20-chars-----^^------22-chars------^
+    # ^-- grep points here
+    #
+    # var_* are as described above
+    # shift_by seems to be safe so long as all patchelf adjustments occur
+    # before any locations pointed to by hardcoded offsets
+    var_skip=20
+    var_select=22
+    shift_by=$(expr $new_size - $orig_size)
+    function fix_offset {
+      # $1 = name of variable to adjust
+      location=$(grep -obUam1 "$1" $bin | cut -d: -f1)
+      location=$(expr $location + $var_skip)
+      value=$(dd if=$bin iflag=count_bytes,skip_bytes skip=$location \
+                 bs=1 count=$var_select status=none)
+      value=$(expr $shift_by + $value)
+      echo -n $value | dd of=$bin bs=1 seek=$location conv=notrunc
+    }
+    fix_offset PAYLOAD_POSITION
+    fix_offset PRELUDE_POSITION
   '';
-
 }