mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

gnome-common: Move from gnome scope to top-level

Browse source 
Most of maintained software moved from Autotools to Meson by now.
This commit is contained in:
Jan Tojnar 2024-06-22 14:02:41 +02:00
parent fedc161645
commit 0fc6f66f88
12 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/graphics/glabels/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, autoreconfHook
{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, gnome-common, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
, intltool, itstool, makeWrapper, pkg-config, yelp-tools, qrencode
}:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ];
buildInputs = [
barcode gtk3 gtk-doc yelp-tools
gnome.gnome-common gsettings-desktop-schemas
gnome-common gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool qrencode
];

4
pkgs/applications/misc/notify-osd-customizable/default.nix
View file

@ -2,7 +2,7 @@
, dbus-glib
, fetchurl
, glib
, gnome
, gnome-common
, libnotify
, libtool
, libwnck
@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config makeWrapper libtool ];
buildInputs = [
glib libwnck libnotify dbus-glib
gsettings-desktop-schemas gnome.gnome-common
gsettings-desktop-schemas gnome-common
];
configureFlags = [ "--libexecdir=$(out)/bin" ];

4
pkgs/applications/misc/plank/default.nix
View file

@ -5,7 +5,7 @@
, cairo
, dconf
, glib
, gnome
, gnome-common
, gtk3
, libwnck
, libX11
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
gettext
gnome.gnome-common
gnome-common
libxml2 # xmllint
pkg-config
vala

4
pkgs/applications/video/byzanz/default.nix
View file

@ -3,7 +3,7 @@
, wrapGAppsHook3
, cairo
, glib
, gnome
, gnome-common
, gst_all_1
, gtk3
, intltool
@ -37,7 +37,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [
which
gnome.gnome-common
gnome-common
glib
libtool
cairo

2
pkgs/desktops/gnome/core/gnome-common/default.nix → pkgs/by-name/gn/gnome-common/package.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
passthru = {
updateScript = gnome.updateScript { packageName = "gnome-common"; attrPath = "gnome.gnome-common"; };
updateScript = gnome.updateScript { packageName = "gnome-common"; };
};
propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which

3
pkgs/desktops/gnome/default.nix
View file

@ -44,8 +44,6 @@ in
gnome-control-center = callPackage ./core/gnome-control-center { };
gnome-common = callPackage ./core/gnome-common { };
gnome-dictionary = callPackage ./core/gnome-dictionary { };
gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
@ -241,6 +239,7 @@ in
file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13.
ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22.
gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13.
gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22.
gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22.
gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22.
gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22.

4
pkgs/development/libraries/bamf/default.nix
View file

@ -2,7 +2,7 @@
, lib
, autoreconfHook
, gitUpdater
, gnome
, gnome-common
, which
, fetchgit
, libgtop
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
autoreconfHook
dbus
docbook_xsl
gnome.gnome-common
gnome-common
gobject-introspection
gtk-doc
pkg-config

4
pkgs/development/libraries/keybinder/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome-common
, gtk-doc, gtk2, lua, gobject-introspection
}:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoconf automake gobject-introspection ];
buildInputs = [
libtool gnome.gnome-common gtk-doc gtk2
libtool gnome-common gtk-doc gtk2
lua
];

4
pkgs/development/libraries/keybinder3/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome-common
, gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection
}:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
automake
libtool
pkg-config
gnome.gnome-common
gnome-common
gtk-doc
gobject-introspection
];

3
pkgs/development/libraries/libepc/default.nix
View file

@ -2,6 +2,7 @@
, lib
, fetchurl
, autoreconfHook
, gnome-common
, pkg-config
, intltool
, gtk-doc
@ -32,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
autoreconfHook
gnome.gnome-common
gnome-common
pkg-config
intltool
gtk-doc

6
pkgs/development/libraries/osm-gps-map/default.nix
View file

@ -1,4 +1,4 @@
{ cairo, fetchzip, glib, gnome, gtk3, gobject-introspection, pkg-config, lib, stdenv }:
{ cairo, fetchzip, glib, gnome, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }:
stdenv.mkDerivation rec {
pname = "osm-gps-map";
@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ pkg-config gobject-introspection ];
nativeBuildInputs = [ pkg-config gobject-introspection gnome-common ];
buildInputs = [
cairo glib
gnome.gnome-common gtk3 gnome.libsoup
gtk3 gnome.libsoup
];
meta = with lib; {

8
pkgs/top-level/all-packages.nix
View file

@ -6756,9 +6756,7 @@ with pkgs;
libsbsms_2_3_0
;
libskk = callPackage ../development/libraries/libskk {
inherit (gnome) gnome-common;
};
libskk = callPackage ../development/libraries/libskk { };
m17-cxx-demod = callPackage ../applications/radio/m17-cxx-demod { };
@ -10141,9 +10139,7 @@ with pkgs;
libite = callPackage ../development/libraries/libite { };
liblangtag = callPackage ../development/libraries/liblangtag {
inherit (gnome) gnome-common;
};
liblangtag = callPackage ../development/libraries/liblangtag { };
liblouis = callPackage ../development/libraries/liblouis { };