From 03fd95179ec88345aa226dec913211199f0dfc2a Mon Sep 17 00:00:00 2001
From: Daniel Winkler <daniel.winkler@s.wu.ac.at>
Date: Sat, 31 May 2025 14:08:52 +0200
Subject: [PATCH] Refactor of rix package import

---
 templates/r/flake.nix | 12 ++++++------
 templates/r/rpkgs.nix |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/templates/r/flake.nix b/templates/r/flake.nix
index 9e70172..da72aeb 100644
--- a/templates/r/flake.nix
+++ b/templates/r/flake.nix
@@ -23,9 +23,12 @@
             ++ [
               (utils.standardPluginOverlay inputs)
               (final: prev: {
-                rpkgs = import inputs.rixpkgs {inherit system;};
+                rpkgs = inputs.rixpkgs.legacyPackages.${system};
               })
-              (import ./rpkgs.nix)
+              (import (builtins.path {
+                path = ./rpkgs.nix;
+                name = "my-rpackages";
+              }))
             ];
           categoryDefinitions = utils.mergeCatDefs prev.categoryDefinitions (
             {
@@ -36,9 +39,7 @@
               extra,
               mkPlugin,
               ...
-            } @ packageDef: let
-              rpkgs = import ./rpkgs.nix pkgs;
-            in {
+            } @ packageDef: {
               lspsAndRuntimeDeps.rdev = with pkgs; [
                 rWrapper
                 just
@@ -64,7 +65,6 @@
             };
         });
       in
-        # and
         utils.mkAllWithDefault finalPackage
     );
   };
diff --git a/templates/r/rpkgs.nix b/templates/r/rpkgs.nix
index ae55115..b9706e1 100644
--- a/templates/r/rpkgs.nix
+++ b/templates/r/rpkgs.nix
@@ -28,6 +28,7 @@ final: prev: let
     })
   ];
 in {
-  rWrapper = prev.rpkgs.rWrapper.override {packages = reqPkgs;};
   quarto = prev.rpkgs.quarto.override {extraRPackages = reqPkgs;};
+  rWrapper = prev.rpkgs.rWrapper.override {packages = reqPkgs;};
+  radianWrapper = prev.rpkgs.radianWrapper.override {packages = reqPkgs;};
 }