diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-20 04:25:38 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-11-20 04:58:00 +0100 |
| commit | a7f4c78792b6f105b3c26a9590b5e3f0baaab0f1 (patch) | |
| tree | 12f19e68275ec6f0d9a34818c54935118cb3e16e /pkgs/desktops/gnome-3 | |
| parent | 5b11829a631951db37076f92e1a3672d8f0995f4 (diff) | |
| download | nixpkgs-a7f4c78792b6f105b3c26a9590b5e3f0baaab0f1.tar nixpkgs-a7f4c78792b6f105b3c26a9590b5e3f0baaab0f1.tar.gz nixpkgs-a7f4c78792b6f105b3c26a9590b5e3f0baaab0f1.tar.bz2 nixpkgs-a7f4c78792b6f105b3c26a9590b5e3f0baaab0f1.tar.lz nixpkgs-a7f4c78792b6f105b3c26a9590b5e3f0baaab0f1.tar.xz nixpkgs-a7f4c78792b6f105b3c26a9590b5e3f0baaab0f1.tar.zst nixpkgs-a7f4c78792b6f105b3c26a9590b5e3f0baaab0f1.zip | |
gnome-user-docs: move to top-level again
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix | 42 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 4 |
2 files changed, 2 insertions, 44 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 deleted file mode 100644 index d9231a7d85c..00000000000 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv -, fetchurl -, gettext -, gnome3 -, itstool -, libxml2 -, yelp-tools -}: - -stdenv.mkDerivation rec { - pname = "gnome-user-docs"; - version = "3.34.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11m9fv8k2hynrcgah4jvbm6yczg0s1ly302mipysbwpn6gbdkvf2"; - }; - - nativeBuildInputs = [ - gettext - itstool - libxml2 - yelp-tools - ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with stdenv.lib; { - description = "User and system administration help for the GNOME desktop"; - homepage = "https://help.gnome.org/users/gnome-help/"; - license = licenses.cc-by-30; - maintainers = gnome3.maintainers; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 1e138b1ba6c..1e760c06029 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -99,8 +99,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-themes-extra = callPackage ./core/gnome-themes-extra { }; - gnome-user-docs = callPackage ./core/gnome-user-docs { }; - gnome-user-share = callPackage ./core/gnome-user-share { }; gucharmap = callPackage ./core/gucharmap { }; @@ -355,6 +353,8 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) vala; # added 2019-10-10 + inherit (pkgs) gnome-user-docs; # added 2019-11-20 + inherit (pkgs) gegl_0_4; # added 2019-10-31 inherit (pkgs) gjs; # added 2019-01-05 |