1 files changed, 21 insertions, 14 deletions
diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix
index 561dfca37aa58..2a3cd46c27239 100644
--- a/pkgs/by-name/re/renode/package.nix
+++ b/pkgs/by-name/re/renode/package.nix
@@ -7,9 +7,10 @@
 , nix-update-script
 , glibcLocales
 , python3Packages
-, gtk-sharp-2_0
-, gtk2-x11
-, screen
+, dotnetCorePackages
+, gtk-sharp-3_0
+, gtk3-x11
+, dconf
 }:
 
 let
@@ -18,6 +19,13 @@ let
     psutil
     pyyaml
     requests
+    tkinter
+
+    # from tools/csv2resd/requirements.txt
+    construct
+
+    # from tools/execution_tracer/requirements.txt
+    pyelftools
 
     (robotframework.overrideDerivation (oldAttrs: {
       src = fetchFromGitHub {
@@ -34,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.15.1";
 
   src = fetchurl {
-    url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-portable.tar.gz";
-    hash = "sha256-W+JtyaXcYZD+iaVEFX6eatxV3/Vr4aZrsCLm1Aj+ISs=";
+    url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
+    hash = "sha256-NrbdkHxZ5g4dhmkhOIWTSxuY3GA1h1FM5JkWVPuQjjc=";
   };
 
   nativeBuildInputs = [
@@ -44,9 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   propagatedBuildInputs = [
-    gtk2-x11
-    gtk-sharp-2_0
-    screen
+    gtk-sharp-3_0
   ];
 
   strictDeps = true;
@@ -58,17 +64,18 @@ stdenv.mkDerivation (finalAttrs: {
 
     mv * $out/libexec/renode
     mv .renode-root $out/libexec/renode
-    chmod +x $out/libexec/renode/*.so
 
     makeWrapper "$out/libexec/renode/renode" "$out/bin/renode" \
-      --prefix PATH : "$out/libexec/renode" \
-      --suffix LD_LIBRARY_PATH : "${gtk2-x11}/lib" \
+      --prefix PATH : "$out/libexec/renode:${lib.makeBinPath [ dotnetCorePackages.runtime_8_0 ]}" \
+      --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
+      --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3-x11 ]}" \
+      --prefix PYTHONPATH : "${pythonLibs}" \
       --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
-
     makeWrapper "$out/libexec/renode/renode-test" "$out/bin/renode-test" \
-      --prefix PATH : "$out/libexec/renode" \
+      --prefix PATH : "$out/libexec/renode:${lib.makeBinPath [ dotnetCorePackages.runtime_8_0 ]}" \
+      --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
+      --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3-x11 ]}" \
       --prefix PYTHONPATH : "${pythonLibs}" \
-      --suffix LD_LIBRARY_PATH : "${gtk2-x11}/lib" \
       --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
 
     substituteInPlace "$out/libexec/renode/renode-test" \