switch to develop

default.nix

@@ -1,4 +1,4 @@
-{ stdenv, bundlerEnv, ruby_2_7, callPackage
+{ stdenv, bundlerEnv, ruby, callPackage, perl, defaultGemConfig
 
 , pname ? "diaspora"
 , version ? import ./version.nix
@@ -7,26 +7,28 @@
 stdenv.mkDerivation rec {
   inherit pname version;
 
+  src = callPackage ./source.nix {};
+
   diasporaGems = bundlerEnv {
     name = "${pname}-gems-${version}";
     version = version;
-    ruby = ruby_2_7;
-    gemdir  = callPackage ./source.nix {};
+    ruby = ruby;
+    gemconfig = defaultGemConfig // {    
+    	kostya-sigar = attrs: {
+		buildInputs = [ perl ];
+	};
+   };
+    gemdir  = src;
     gemset = ./gemset.nix;
   };
 
   name = "diaspora";
-  src = ./.;
   buildInputs = [diasporaGems ruby];
   installPhase = ''
-    mkdir -p $out/{bin,share/diaspora}
-    cp -r * $out/share/diaspora
-    bin=$out/bin/diaspora
-# we are using bundle exec to start in the bundled environment
-    cat > $bin <<EOF
-#!/bin/sh -e
-exec ${diasporaGems}/bin/bundle exec ${ruby}/bin/ruby $out/share/diaspora/diaspora "\$@"
-EOF
-    chmod +x $bin
-  '';
+mkdir -p $out/{bin,share/diaspora}
+cp -r * $out/share/diaspora
+bin=$out/bin/diaspora
+
+chmod +x $bin
+'';
 }

shell.nix

@@ -2,7 +2,7 @@ with import <nixpkgs> {};
 stdenv.mkDerivation {
   name = "env";
   buildInputs = [
-    ruby_2_7.devEnv
+    ruby.devEnv
     git
     patch
     imagemagick

source.nix

@@ -3,8 +3,8 @@
   src = fetchFromGitHub {
     owner = "diaspora";
     repo = "diaspora";
-    rev = "v0.7.18.2";
-    sha256 = "1fla7wlwnsv5gqnjfiigxrjgkka6msjkk1pw493c4d5l3dqh5hkm";
+    rev = "744f5449fb7bfd1ac2bfd50d2e157d97c77a3bca";
+    sha256 = "193sv84489bq9s98lqqgpc0p32jy8qpzmii1y1lv4fgf7v121f70";
   };
 in applyPatches {
   inherit src;

version.nix

@@ -1 +1 @@
-"v0.7.18.2"
+"unstable-2023-07-09"