Introduce a flake, modern setup

This commit is contained in:
Doron Behar 2021-05-14 17:15:05 +03:00
parent a476a83bc7
commit 11817b35d1
8 changed files with 184 additions and 93 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
result

23
README.adoc Normal file
View file

@ -0,0 +1,23 @@
= Matlab for Nix users
This repo is a collection of files that should help Nix and NixOS users install matlab imperatively.
== How to use this
=== Installation of matlab itself
==== Run `matlab-shell` with +++<s>stable</s>+++ legacy Nix
==== Run `matlab-shell` with an unstable Nix
=== Adding `matlab` executables to your system
==== For NixOS users with a flakes setup
==== For NixOS users without a flakes setup
==== Home Manager setup
== Previous work
TODO:: Add links to tviti's repo etc.

View file

@ -2,14 +2,9 @@
R2020a, available at
https://github.com/mathworks-ref-arch/container-images
*/
pkgs:
{ }:
rec {
runPath = "$HOME/downloads/software/matlab/installation";
targetPkgs = pkgs:
with pkgs;
[
(with pkgs; [
cacert
alsaLib # libasound2
atk
@ -44,7 +39,7 @@ rec {
udev
jre
ncurses # Needed for CLI
] ++ (with xorg; [
]) ++ (with pkgs.xorg; [
libSM
libX11
libxcb
@ -61,5 +56,4 @@ rec {
libXt
libXtst
libXxf86vm
]);
}
])

View file

@ -1,9 +1,10 @@
{ callPackage }:
# TODO: Be explicit about versions in file and object names!
let
common = import ./common.nix { };
in {
matlab = callPackage ./matlab.nix { inherit common; };
mlint = callPackage ./mlint.nix { inherit common; };
}
# https://nixos.wiki/wiki/Flakes#Using_flakes_project_from_a_legacy_Nix
(import (
let
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
in fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash; }
) {
src = ./.;
}).defaultNix

42
flake.lock Normal file
View file

@ -0,0 +1,42 @@
{
"nodes": {
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1606424373,
"narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1620453058,
"narHash": "sha256-W10HN+A5Y0vX1TKwdEfcSelxnuPYKe5r6GBmGfufM8w=",
"owner": "doronbehar",
"repo": "nixpkgs",
"rev": "cb6c03e197a983fb440d1dd6534fdd0f986d615c",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"root": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

56
flake.nix Normal file
View file

@ -0,0 +1,56 @@
{
description = "Nix files made to ease imperative installation of matlab";
# https://nixos.wiki/wiki/Flakes#Using_flakes_project_from_a_legacy_Nix
inputs.flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
};
outputs = { self, nixpkgs, flake-compat }:
let
# We don't use flake-utils.lib.eachDefaultSystem since only x86_64-linux is
# supported
pkgs = nixpkgs.legacyPackages.x86_64-linux;
targetPkgs = import ./common.nix;
# TODO: Make it possible to override this - imperatively or declaratively?
defaultRunPath = "$HOME/downloads/software/matlab/installation";
# TODO: This doesn't work - matlab is unusable
runScriptPrefix = ''
#!${pkgs.bash}/bin/bash
export MATLAB_JAVA=/usr/lib/openjdk
export QT_QPA_PLATFORM=xcb
'';
in {
packages.x86_64-linux.matlab = pkgs.buildFHSUserEnv {
name = "matlab";
inherit targetPkgs;
runScript = runScriptPrefix + ''
exec ${defaultRunPath}/bin/matlab "$@"
'';
};
packages.x86_64-linux.matlab-shell = pkgs.buildFHSUserEnv {
name = "matlab-shell";
inherit targetPkgs;
};
packages.x86_64-linux.mlint = pkgs.buildFHSUserEnv {
name = "mlint";
inherit targetPkgs;
runScript = runScriptPrefix + ''
exec ${defaultRunPath}/bin/glnxa64/mlint "$@"
'';
};
overlay = final: prev: {
inherit (self.packages.x86_64-linux) matlab matlab-shell mlint;
};
devShell.x86_64-linux = pkgs.mkShell {
buildInputs = (targetPkgs pkgs) ++ [
self.packages.x86_64-linux.matlab-shell
];
};
defaultPackage.x86_64-linux = self.packages.x86_64-linux.matlab;
};
}

View file

@ -1,17 +0,0 @@
{ common, writeScriptBin, buildFHSUserEnv }:
let
matlab-wrapped = with common;
writeScriptBin "matlab" ''
#!/bin/sh
export MATLAB_JAVA=/usr/lib/openjdk
export QT_QPA_PLATFORM=xcb
exec ${runPath}/bin/matlab "$@"
'';
in buildFHSUserEnv {
name = "matlab";
targetPkgs = pkgs: with pkgs; (common.targetPkgs pkgs) ++ [ matlab-wrapped ];
runScript = "${matlab-wrapped}/bin/matlab";
}

View file

@ -1,9 +0,0 @@
{ common, buildFHSUserEnv }:
buildFHSUserEnv {
name = "mlint";
inherit (common) targetPkgs;
runScript = with common; "${runPath}/bin/glnxa64/mlint";
}