Unverified Commit 8471cfbf authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #321785 from jtojnar/libgnome-keyring 

libgnome-keyring: Unify
parents 383e9b56 859183c0

pkgs/applications/misc/lutris/fhsenv.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec { 
    atk

    pango

    freetype

    libgnome-keyring3

    libgnome-keyring

    fontconfig

    gdk-pixbuf

    cairo

pkgs/applications/networking/p2p/retroshare/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/desktops/gnome/core/libgnome-keyring/default.nix→pkgs/by-name/li/libgnome-keyring/package.nix

+14 −0
Original line number Diff line number Diff line
@@ -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 = {

pkgs/desktops/gnome/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -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