diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-24 11:50:58 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-24 11:50:58 +0200 |
| commit | 0a874ff2a6dad9d2693f08a733d58f8077f36916 (patch) | |
| tree | 80360888241c761769d9a1074fd96b22d7664598 /pkgs/desktops/gnome-3 | |
| parent | 91104b5417275b780f6947b46a5c1bcc0d99f10b (diff) | |
| parent | bc00ecedfa709f4fa91d445dd76ecd792cb2c728 (diff) | |
| download | nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.tar nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.tar.gz nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.tar.bz2 nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.tar.lz nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.tar.xz nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.tar.zst nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 17f359e7d28..8f2e78c639c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.36.4"; + version = "3.36.5"; outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nyibrr98ijn65z9ki0k7xzcwcliwy2jqssz0l0jalpbkhnr751d"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1hj7gmjmy92xndlgw7pzk5m6j2fbzcgfd1pxc32k38gml8qg19d4"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix index 71b53094674..f170a2fb190 100644 --- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchFromGitLab }: +{ stdenv, fetchFromGitLab, glib, gnome3, unzip }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-night-theme-switcher"; - version = "19"; + version = "36"; src = fetchFromGitLab { owner = "rmnvgr"; repo = "nightthemeswitcher-gnome-shell-extension"; rev = "v${version}"; - sha256 = "1ll0yf1skf51wa10mlrajd1dy459w33kx0i3vhfcx2pdk7mw5a3c"; + sha256 = "1c88979qprwb5lj0v7va017w7rdr89a648anhw4k5q135jwyskpz"; }; - # makefile tries to do install in home directory using - # `gnome-extensions install` - dontBuild = true; + buildInputs = [ glib gnome3.gnome-shell unzip ]; uuid = "nightthemeswitcher@romainvigier.fr"; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions/ - cp -r src/ $out/share/gnome-shell/extensions/${uuid} + unzip build/${uuid}.shell-extension.zip -d $out/share/gnome-shell/extensions/${uuid} runHook postInstall ''; |