From d15434a96b5c3612ddd1cac3e40a1dccad5f8e0c Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 4 Mar 2024 22:51:56 +0800 Subject: [PATCH] ags: use nixpkgs' version for Typescript That's what the upstream uses so we'll go with it. --- pkgs/ags/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/ags/default.nix b/pkgs/ags/default.nix index ad16fd8e..16a8c0a1 100644 --- a/pkgs/ags/default.nix +++ b/pkgs/ags/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , meson , ninja +, nodePackages , pkg-config , gobject-introspection , gjs @@ -41,6 +42,7 @@ buildNpmPackage rec { pkg-config gjs gobject-introspection + nodePackages.typescript wrapGAppsHook ]; @@ -57,13 +59,6 @@ buildNpmPackage rec { upower ]; - # TODO: I have no idea how to properly make use of the binaries from - # node_modules folder, pls fix later (or is this the most Nix-idiomatic way of - # doing this?). :( - preConfigure = '' - addToSearchPath PATH $PWD/node_modules/.bin - ''; - postPatch = '' chmod u+x ./post_install.sh && patchShebangs ./post_install.sh '';