Skip to content

Commit

Permalink
Update isis (for now)
Browse files Browse the repository at this point in the history
  • Loading branch information
arunoruto committed Nov 3, 2024
1 parent 19f24aa commit 5af036b
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 18 deletions.
13 changes: 11 additions & 2 deletions modules/home-manager/server/shell/nushell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
config,
lib,
pkgs,
osConfig,
...
}:
}@args:
{
options.nushell.enable = lib.mkEnableOption "Configure nushell for you";

Expand Down Expand Up @@ -116,7 +117,15 @@
''
+ lib.optionalString config.skim.enable ''
plugin add ${lib.getExe pkgs.unstable.nushellPlugins.skim}
'';
''
+ (
let
path = osConfig.services.ssh-tpm-agent.userProxyPath;
in
lib.optionalString ((args ? nixosConfig) && (path != "")) ''
$env.SSH_AUTH_SOCK = ($env.XDG_RUNTIME_DIR + '/ssh-tpm-agent.sock')
''
);
};
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ pkgs: {
candy-icons = pkgs.callPackage ./candy-icons/package.nix { };
mstm = pkgs.callPackage ./mstm/parallel.nix { };
zen-browser = pkgs.callPackage ./zen-browser/package.nix { };
# isis = pkgs.callPackage ./isis/package.nix { };
isis = pkgs.callPackage ./isis/package.nix { };
}
40 changes: 25 additions & 15 deletions pkgs/isis/package.nix
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
{
lib,
stdenvNoCC,
# fetchFromGitHub,
conda,
stdenv,
makeWrapper,

# runtime
xercesc,
}:
let
pname = "isis";
version = "8.3.0";

in
stdenvNoCC.mkDerivation {
stdenv.mkDerivation {
inherit pname;
inherit version;

# src = fetchFromGitHub {
# owner = "DOI-USGS";
# repo = pname;
# rev = version;
# hash = "sha256-84DuZhzwqdE1ZFv5ytg4XxveuHXacFelYC0ERlExLS4=";
# };
src = builtins.fetchTarball {
url = "https://anaconda.org/usgs-astrogeology/${pname}/${version}/download/linux-64/${pname}-${version}-0.tar.bz2";
sha256 = "sha256:0l910hqwrnd6c9zyc031x2iw1ji07amhs82g0c67lyxcj59nk1k7";
sha256 = "sha256:0b0wlb9z9p5liws38bhbjvjpb2603355bwbkgv5x81p7pyf4wkdi";
};

buildInputs = [
xercesc
];

nativeBuildInputs = [
conda
# conda
# xercesc
makeWrapper
];

buildPhase = ''
Expand All @@ -35,13 +37,21 @@ stdenvNoCC.mkDerivation {
installPhase = ''
# runHook preInstall
# mkdir -p $out/share/icons/candy-icons
# cp -r . $out/share/icons/candy-icons
mkdir -p $out
cp -r . $out
# gtk-update-icon-cache $out/share/icons/candy-icons
# runHook postInstall
runHook postInstall
'';

postInstallPhase = ''
patchelf --set-rpath "${lib.makeLibraryPath [ xercesc ]}" $out/bin/isis2ascii
'';

# extraWrapProgramArgs = ''
# --prefix LD_LIBRARY_PATH : $out/lib : ${lib.makeLibraryPath [ xercesc ]}
# '';

meta = with lib; {
homepage = "https://isis.astrogeology.usgs.gov";
description = "A digital image processing software package to manipulate imagery collected by current and past NASA and International planetary missions";
Expand Down

0 comments on commit 5af036b

Please sign in to comment.