summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-10-01 01:56:38 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-10-05 02:07:09 +0200
commit9db0207496cc0ba7534890230b79f1353e5c4785 (patch)
tree4102a1ae4a7bac1eb9da60df48e335413593064c /pkgs
parent959435e83576141f0e0ad35f49c3b89bd091caa5 (diff)
downloadnixpkgs-9db0207496cc0ba7534890230b79f1353e5c4785.tar
nixpkgs-9db0207496cc0ba7534890230b79f1353e5c4785.tar.gz
nixpkgs-9db0207496cc0ba7534890230b79f1353e5c4785.tar.bz2
nixpkgs-9db0207496cc0ba7534890230b79f1353e5c4785.tar.lz
nixpkgs-9db0207496cc0ba7534890230b79f1353e5c4785.tar.xz
nixpkgs-9db0207496cc0ba7534890230b79f1353e5c4785.tar.zst
nixpkgs-9db0207496cc0ba7534890230b79f1353e5c4785.zip
gnome3: remove version attribute
It was used by some themes in the past, but it broke them whenever GNOME
was updated, so it should not be used anymore.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix2
-rw-r--r--pkgs/desktops/gnome-3/default.nix1
-rw-r--r--pkgs/misc/themes/materia-theme/default.nix2
3 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 1938c90a825..24bf5dc3365 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gnome3.yelp itstool libxml2 intltool ];
 
   meta = with stdenv.lib; {
-    homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}";
+    homepage = https://help.gnome.org/users/gnome-help/;
     description = "User and system administration help for the GNOME desktop";
     maintainers = gnome3.maintainers;
     license = licenses.cc-by-30;
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 5112f8b496f..0f9108465b1 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -7,7 +7,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   updateScript = callPackage ./update.nix { };
 
-  version = "3.26";
   maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar ];
 
   corePackages = with gnome3; [
diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index 0dd490a35b5..c486d8462ce 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     patchShebangs install.sh
     sed -i install.sh \
       -e "s|if .*which gnome-shell.*;|if true;|" \
-      -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|"
+      -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|"
     mkdir -p $out/share/themes
     ./install.sh --dest $out/share/themes
     rm $out/share/themes/*/COPYING