diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-05-07 23:18:14 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-08 09:47:42 +0200 |
commit | 468cb5980b56d348979488a74a9b5de638400160 (patch) | |
tree | 1426485105b897074e82af80efdd545462edb211 /pkgs/applications/science | |
parent | d03a5eb09720fd6ad670df12d8eafbbfcd7ff494 (diff) |
gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/electronics/kicad/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/math/wxmaxima/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 76048733a6a38..86bda3092bc47 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitLab -, gnome3 +, gnome , dconf , wxGTK30 , wxGTK31 @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" - "--prefix XDG_DATA_DIRS : ${gnome3.adwaita-icon-theme}/share" + "--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" # wrapGAppsHook did these two as well, no idea if it matters... diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 20a17b11221a0..9d6212fef1126 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,7 @@ , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses , buildIde ? true -, glib, gnome3, wrapGAppsHook +, glib, gnome, wrapGAppsHook , csdp ? null , version, coq-version ? null, }@args: @@ -128,7 +128,7 @@ self = stdenv.mkDerivation { buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if versionAtLeast "8.10" - then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.adwaita-icon-theme wrapGAppsHook ] + then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ] else [ ocamlPackages.lablgtk ]); postPatch = '' diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 25215d7abb56d..94e675d7dd444 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , wrapGAppsHook, cmake, gettext -, maxima, wxGTK, gnome3 }: +, maxima, wxGTK, gnome }: stdenv.mkDerivation rec { pname = "wxmaxima"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-5nvaaKsvSEs7QxOszjDK1Xkana2er1BCMZ83b1JZSqc="; }; - buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; + buildInputs = [ wxGTK maxima gnome.adwaita-icon-theme ]; nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; |