chore: update pop-shell

This commit is contained in:
Felix Schröter 2021-09-19 11:58:01 +02:00
parent 515320aa90
commit 7af34f0737
No known key found for this signature in database
GPG key ID: 910ACB9F6BD26F58
3 changed files with 29 additions and 23 deletions

View file

@ -1,28 +1,6 @@
{ config, pkgs, ... }:
with pkgs;
let
pop-shell = stdenv.mkDerivation rec {
pname = "pop-shell";
version = "2021-05-07";
src = fetchFromGitHub {
owner = "pop-os";
repo = "shell";
rev = "9507dc38f75f56e657cf071d5f8dc578c5dc9352";
sha256 = "161946y5nk1nlxafhkxyshqn4va10rk911bdbcwxjnak1w7557gm";
};
nativeBuildInputs = [ glib nodePackages.typescript ];
# 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"
];
};
in {
{
environment.systemPackages = with pkgs;
with gnomeExtensions; [
gnome.dconf-editor

View file

@ -70,6 +70,9 @@
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;
};
@ -86,6 +89,7 @@
nur.overlay
overlays.neovim
overlays.deconz
overlays.pop-shell
overlays.photoprism
overlays.obelisk
];

View file

@ -0,0 +1,24 @@
{ lib, fetchFromGitHub, stdenv, glib, nodePackages, gjs }:
stdenv.mkDerivation rec {
pname = "pop-shell";
version = "2021-09-10";
src = fetchFromGitHub {
owner = "pop-os";
repo = "shell";
rev = "59ca9cede3c185c347bd2ae3d40882e020fb1fd0";
sha256 = "llwchrg/a8QmmD9eOt7IUZY2crYubFSDyvrTVwSz0pE=";
};
nativeBuildInputs = [ glib nodePackages.typescript gjs ];
buildInputs = [ gjs ];
# 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"
];
}