gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
This commit is contained in:
@@ -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...
|
||||
|
||||
@@ -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 = ''
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user