nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Patch aarch64 fhs wraps to use EnvChroot

Browse source
This commit is contained in:
Natsu Kagami 2023-04-18 12:22:05 +02:00
parent 341216cd94
commit 37b30aa60e
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/aarch64-linux/typora.nix
View file

@ -1,4 +1,4 @@
{ pkgs, runCommand, zstd, lib, buildFHSUserEnv }: { pkgs, runCommand, zstd, lib, buildFHSEnvChroot }:
let let
typora-tar = builtins.fetchurl { typora-tar = builtins.fetchurl {
@ -11,7 +11,7 @@ let
tar xvf ${typora-tar} -C $out tar xvf ${typora-tar} -C $out
''; '';
in in
buildFHSUserEnv { buildFHSEnvChroot {
name = "typora"; name = "typora";
targetPkgs = pkgs: with pkgs; [ targetPkgs = pkgs: with pkgs; [
glib glib

6
packages/aarch64-linux/zotero.nix
View file

@ -1,4 +1,4 @@
{ pkgs, runCommand, zstd, lib, buildFHSUserEnv }: { pkgs, runCommandLocal, zstd, lib, buildFHSEnvChroot }:
let let
zotero-tar = builtins.fetchurl { zotero-tar = builtins.fetchurl {
@ -6,13 +6,13 @@ let
sha256 = "sha256:1fqvcbffqfrnmfz7rcmbngik37wz9dh11q9shrd9cwkq6zay9b6k"; sha256 = "sha256:1fqvcbffqfrnmfz7rcmbngik37wz9dh11q9shrd9cwkq6zay9b6k";
}; };
zotero-src = runCommand "zotero-src" { } '' zotero-src = runCommandLocal "zotero-src" { } ''
mkdir -p $out mkdir -p $out
export PATH=${zstd}/bin:$PATH export PATH=${zstd}/bin:$PATH
tar xvf ${zotero-tar} -C $out tar xvf ${zotero-tar} -C $out
''; '';
in in
buildFHSUserEnv { buildFHSEnvChroot {
name = "zotero"; name = "zotero";
targetPkgs = pkgs: with pkgs; [ gtk3 dbus-glib libstartup_notification libpaper ] ++ (with pkgs.xorg; [ libX11 libXt ]); targetPkgs = pkgs: with pkgs; [ gtk3 dbus-glib libstartup_notification libpaper ] ++ (with pkgs.xorg; [ libX11 libXt ]);
runScript = "env QT_SCALE_FACTOR=2 ${zotero-src}/usr/lib/zotero/zotero"; runScript = "env QT_SCALE_FACTOR=2 ${zotero-src}/usr/lib/zotero/zotero";