From aa934ff115bdaf790d741ed10a88bc6c6c99652f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 2 Apr 2022 08:52:05 +0300 Subject: [PATCH] Remove version suffix from python package --- flake.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index b480ec7..01bc05e 100644 --- a/flake.nix +++ b/flake.nix @@ -123,7 +123,7 @@ # set, defined with `packageOverrides`, but this won't bring any benefit # because in order to use the matlab engine, one needs to be inside an # FHSUser environment anyway. - packages.x86_64-linux.matlab-python-package-R2021b = pkgs.python3.pkgs.buildPythonPackage rec { + packages.x86_64-linux.matlab-python-package = pkgs.python3.pkgs.buildPythonPackage rec { # No version - can be used with every matlab version (R2021b or R2021a etc) name = "matlab-python-package"; unpackCmd = '' @@ -174,7 +174,7 @@ name = "matlab-python-shell"; inherit targetPkgs; runScript = shellHooksCommon + '' - export PYTHONPATH=${self.packages.x86_64-linux.matlab-python-package-R2021b}/${pkgs.python3.sitePackages} + export PYTHONPATH=${self.packages.x86_64-linux.matlab-python-package}/${pkgs.python3.sitePackages} exec python "$@" ''; meta = metaCommon // { @@ -205,7 +205,12 @@ }; }; overlay = final: prev: { - inherit (self.packages.x86_64-linux) matlab matlab-shell matlab-mlint matlab-mex; + inherit (self.packages.x86_64-linux) + matlab + matlab-shell + matlab-mlint + matlab-mex + ; }; inherit shellHooksCommon; devShell.x86_64-linux = pkgs.mkShell {