diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index acdbf8835e31f..3d241f30efa22 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -7,7 +7,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop gnome.libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 93fb435f3909a..4411fbc6e9bc9 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { atk pango freetype - libgnome-keyring3 + libgnome-keyring fontconfig gdk-pixbuf cairo diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 741cca91543ac..e4e44f79aea5f 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -2,7 +2,7 @@ , fetchpatch , qmake, cmake, pkg-config, miniupnpc, bzip2 , speex, libmicrohttpd, libxml2, libxslt, sqlcipher, rapidjson, libXScrnSaver -, qtbase, qtx11extras, qtmultimedia, libgnome-keyring3 +, qtbase, qtx11extras, qtmultimedia, libgnome-keyring }: mkDerivation rec { @@ -33,7 +33,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake cmake ]; buildInputs = [ - speex miniupnpc qtmultimedia qtx11extras qtbase libgnome-keyring3 + speex miniupnpc qtmultimedia qtx11extras qtbase libgnome-keyring bzip2 libXScrnSaver libxml2 libxslt sqlcipher libmicrohttpd rapidjson ]; diff --git a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/pkgs/by-name/li/libgnome-keyring/package.nix similarity index 70% rename from pkgs/desktops/gnome/core/libgnome-keyring/default.nix rename to pkgs/by-name/li/libgnome-keyring/package.nix index 912953dfb33f6..e845970a6ad7d 100644 --- a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix +++ b/pkgs/by-name/li/libgnome-keyring/package.nix @@ -13,9 +13,23 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + strictDeps = true; propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + configureFlags = [ + # not ideal to use -config scripts but it's not possible switch it to pkg-config + # binaries in dev have a for build shebang + "LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}" + ]; + + postPatch = '' + # uses pkg-config in some places and uses the correct $PKG_CONFIG in some + # it's an ancient library so it has very old configure scripts and m4 + substituteInPlace ./configure \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 022021ea6cf73..85a78c6d18fdb 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -55,8 +55,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-keyring = callPackage ./core/gnome-keyring { }; - libgnome-keyring = callPackage ./core/libgnome-keyring { }; - gnome-initial-setup = callPackage ./core/gnome-initial-setup { }; gnome-online-miners = callPackage ./core/gnome-online-miners { }; @@ -257,6 +255,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-packagekit = callPackage ./misc/gnome-packagekit { }; }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. + libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22. gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ directly."; # converted to throw on 2023-12-27 gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2e81440fca778..3f82461c4f1cc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -126016,22 +126016,21 @@ self: { }) {}; "gnome-keyring" = callPackage - ({ mkDerivation, base, bytestring, c2hs, gnome-keyring - , libgnome-keyring, text, time + ({ mkDerivation, base, bytestring, c2hs, libgnome-keyring + , text, time }: mkDerivation { pname = "gnome-keyring"; version = "0.3.1.1"; sha256 = "044bbgy8cssi1jc8wwb0kvxpw6d7pwxackkzvw7p9r8ybmgv4d0b"; libraryHaskellDepends = [ base bytestring text time ]; - librarySystemDepends = [ gnome-keyring ]; + librarySystemDepends = [ libgnome-keyring ]; libraryPkgconfigDepends = [ libgnome-keyring ]; libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs.gnome) gnome-keyring; - inherit (pkgs) libgnome-keyring;}; + }) {inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome-vfs diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix deleted file mode 100644 index f31f26539a55d..0000000000000 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libgnome-keyring"; - version = "2.32.0"; - - src = let - inherit (finalAttrs) pname version; - in fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; - }; - - outputs = [ "out" "dev" ]; - - strictDeps = true; - propagatedBuildInputs = [ glib dbus libgcrypt ]; - nativeBuildInputs = [ pkg-config intltool ]; - - configureFlags = [ - # not ideal to use -config scripts but it's not possible switch it to pkg-config - # binaries in dev have a for build shebang - "LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}" - ]; - - postPatch = '' - # uses pkg-config in some places and uses the correct $PKG_CONFIG in some - # it's an ancient library so it has very old configure scripts and m4 - substituteInPlace ./configure \ - --replace "pkg-config" "$PKG_CONFIG" - ''; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = { - pkgConfigModules = [ "gnome-keyring-1" ]; - inherit (glib.meta) platforms maintainers; - homepage = "https://gitlab.gnome.org/Archive/libgnome-keyring"; - license = with lib.licenses; [ gpl2 lgpl2 ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 95fc867172e55..24a418ac4181c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -673,6 +673,7 @@ mapAliases ({ libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08 libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23 libgme = game-music-emu; # Added 2022-07-20 + libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = libgpg-error; # Added 2021-09-04 libheimdal = heimdal; # Added 2022-11-18 libintlOrEmpty = throw "'libintlOrEmpty' has been replaced by gettext"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f52160e15aeae..23d54751a347f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22032,9 +22032,6 @@ with pkgs; libglibutil = callPackage ../development/libraries/libglibutil { }; - libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome-keyring3 = gnome.libgnome-keyring; - libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { }; libgnome-games-support_2_0 = callPackage ../development/libraries/libgnome-games-support/2.0.nix { };