Skip to content
This repository was archived by the owner on Oct 31, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
config = {
permittedInsecurePackages = [
"electron-13.6.9"
"nodejs-14.21.3"
"openssl-1.1.1t"
];
};
}).pkgs.callPackage ./nix/tuxedo-control-center {};
Expand Down
2 changes: 2 additions & 0 deletions nix/module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ in
# See https://github.com/tuxedocomputers/tuxedo-control-center/issues/148
nixpkgs.config.permittedInsecurePackages = [
"electron-13.6.9"
"nodejs-14.21.3"
"openssl-1.1.1t"
];

systemd.services.tccd = {
Expand Down
4 changes: 2 additions & 2 deletions nix/tuxedo-control-center/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let
## Update Instructions
#
# see ./README.md
version = "1.2.5";
version = "2.0.5";

# keep in sync with update.sh!
# otherwise the format of package.json does not mach the format used by the
Expand All @@ -26,7 +26,7 @@ let
owner = "tuxedocomputers";
repo = "tuxedo-control-center";
rev = "v${version}";
sha256 = "EfXMIOGHRp8SjoG85vPpbIExVrVcWzXImrK9BYpt0FE=";
sha256 = "ndYS+cIiXm3jpKi1nNTlGnzuQTwRfe6I/kdkMe+pht0=";
};

preRebuild = ''
Expand Down
2 changes: 1 addition & 1 deletion nix/tuxedo-control-center/node-composition.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:

let
nodeEnv = import ./node-env.nix {
Expand Down
7 changes: 5 additions & 2 deletions nix/tuxedo-control-center/node-env.nix
Original file line number Diff line number Diff line change
Expand Up @@ -530,12 +530,15 @@ let
then
ln -s $out/lib/node_modules/.bin $out/bin

# Patch the shebang lines of all the executables
# Fixup all executables
ls $out/bin/* | while read i
do
file="$(readlink -f "$i")"
chmod u+rwx "$file"
patchShebangs "$file"
if isScript "$file"
then
sed -i 's/\r$//' "$file" # convert crlf to lf
fi
done
fi

Expand Down
Loading