From 20b10194ca1194e7f91f08cc85b2586e20496230 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Thu, 21 Oct 2021 23:57:16 +0200 Subject: [PATCH] fix: fix pop-shell --- pkgs/pop-shell/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/pop-shell/default.nix b/pkgs/pop-shell/default.nix index bc4733a..13a7b43 100644 --- a/pkgs/pop-shell/default.nix +++ b/pkgs/pop-shell/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ gjs ]; preBuildHook = '' - ./fix-gjs.patch find . -name '*.ts' -exec sed -i -E 's|^#!/usr/bin/gjs|#!/usr/bin/env gjs|' \{\} \; - (fetchpatch { + find . -name '*.ts' -exec sed -i -E 's|\["gjs", path]|[path]|' \{\} \; + find . -name '*.ts' -exec sed -i -E 's|`gjs $\{path}`|path|' \{\} \; ''; patches = [ ./gnome-41.patch ]; @@ -31,11 +31,7 @@ stdenv.mkDerivation rec { ]; postInstall = '' - chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/floating_exceptions/main.js chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/floating_exceptions/main.js chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/color_dialog/main.js - chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/color_dialog/main.js - rm -rf $out/bin - rm -rf $out/bin ''; }