From 76a459488cc15493bea9285603433ad4160472fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Thu, 2 Dec 2021 23:52:05 +0100 Subject: [PATCH] chore: remove custom pop-shell package since it is now in nixpkgs --- flake.nix | 4 ---- pkgs/pop-shell/default.nix | 35 ----------------------------------- 2 files changed, 39 deletions(-) delete mode 100644 pkgs/pop-shell/default.nix diff --git a/flake.nix b/flake.nix index 47dffa9..50967b8 100644 --- a/flake.nix +++ b/flake.nix @@ -78,9 +78,6 @@ deconz = self: super: { deconz = self.qt5.callPackage ./pkgs/deconz { }; }; - pop-shell = self: super: { - pop-shell = self.callPackage ./pkgs/pop-shell { }; - }; obelisk = self: super: { obelisk = (import obelisk { inherit (self) system; }).command; }; @@ -97,7 +94,6 @@ nur.overlay overlays.neovim overlays.deconz - overlays.pop-shell overlays.photoprism overlays.obelisk ]; diff --git a/pkgs/pop-shell/default.nix b/pkgs/pop-shell/default.nix deleted file mode 100644 index 4d15b54..0000000 --- a/pkgs/pop-shell/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, fetchFromGitHub, stdenv, glib, nodePackages, gjs }: - -stdenv.mkDerivation rec { - pname = "pop-shell"; - version = "2021-10-26"; - - src = fetchFromGitHub { - owner = "pop-os"; - repo = "shell"; - rev = "4b65ee865d01436ec75a239a0586a2fa6051b8c3"; - sha256 = "DHmp3kzBgbyxRe0TjER/CAqyUmD9LeRqAFQ9apQDzfk="; - }; - - nativeBuildInputs = [ glib nodePackages.typescript gjs ]; - - buildInputs = [ gjs ]; - - preBuildHook = '' - find . -name '*.ts' -exec sed -i -E 's|^#!/usr/bin/gjs|#!/usr/bin/env gjs|' \{\} \; - find . -name '*.ts' -exec sed -i -E 's|\["gjs", path]|[path]|' \{\} \; - find . -name '*.ts' -exec sed -i -E 's|`gjs $\{path}`|path|' \{\} \; - ''; - - # the gschema doesn't seem to be installed properly (see dconf) - makeFlags = [ - "INSTALLBASE=$(out)/share/gnome-shell/extensions" - "PLUGIN_BASE=$(out)/share/pop-shell/launcher" - "SCRIPTS_BASE=$(out)/share/pop-shell/scripts" - ]; - - 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/color_dialog/main.js - ''; -}