From 863e7215f5410ac3c1391e771e621314f170b75a Mon Sep 17 00:00:00 2001
From: David Seseke <david.seseke@uni-hamburg.de>
Date: Tue, 3 Sep 2024 14:56:30 +0200
Subject: [PATCH] Fix dependencies at runtime
---
flake.nix | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/flake.nix b/flake.nix
index 18b4022..4b04b0e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
let
- overlays = [ ];
+ pname = "runCalc";
pkgs = nixpkgs.legacyPackages.${system};
rsienaMod = pkgs.rPackages.buildRPackage {
name = "rsiena";
@@ -21,25 +21,26 @@
};
propagatedBuildInputs = with pkgs.rPackages; [ Matrix lattice MASS xtable ];
};
- buildInputs = with pkgs; [
- R
- # rPackages.RSiena
- rsienaMod
+ R-with-custom-packages = pkgs.rWrapper.override{ packages = with pkgs; [ R rsienaMod ]; };
+ customBuildInputs = [
+ R-with-custom-packages
];
name = "run-calc";
rRunCalc = (pkgs.writeScriptBin name (builtins.readFile ./test_rsiena_installation.R));
+
in rec {
- defaultPackage = packages.runCalc;
+ defaultPackage = packages.${pname};
packages = {
RSiena = rsienaMod;
- runCalc = pkgs.symlinkJoin {
- name = name;
- paths = [ rRunCalc rsienaMod ] ++ buildInputs;
+ ${pname} = pkgs.symlinkJoin {
+ inherit name;
+ paths = [ rRunCalc ] ++ customBuildInputs;
+ buildInputs = [ pkgs.makeWrapper ];
+ postBuild = "wrapProgram $out/bin/${name} --prefix PATH : $out/bin";
};
};
-
devShells.default = pkgs.mkShell {
- packages = [ rRunCalc rsienaMod ] ++ buildInputs;
+ packages = [ rRunCalc rsienaMod ] ++ customBuildInputs;
};
});
}
--
GitLab