Unverified Commit 13da11d8 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #294593 from wegank/nicotine-plus-gtk4 

nicotine-plus: migrate to gtk4
parents b35fc018 9e119fe3

pkgs/applications/networking/soulseek/nicotine-plus/default.nix→pkgs/by-name/ni/nicotine-plus/package.nix

+6 −8
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, wrapGAppsHook

, wrapGAppsHook4

, gdk-pixbuf

, gettext

, gobject-introspection

, gtk3

, gtk4

, python3Packages

}:
@@ -17,15 +16,15 @@ python3Packages.buildPythonApplication rec { 
    owner = "nicotine-plus";

    repo = "nicotine-plus";

    rev = "refs/tags/${version}";

    sha256 = "sha256-dl4fTa+CXsycC+hhSkIzQQxrSkBDPsdrmKdrHPakGig=";

    hash = "sha256-dl4fTa+CXsycC+hhSkIzQQxrSkBDPsdrmKdrHPakGig=";

  };



  nativeBuildInputs = [ gettext wrapGAppsHook gobject-introspection ];

  nativeBuildInputs = [ gettext wrapGAppsHook4 gobject-introspection ];



  propagatedBuildInputs = [

    gdk-pixbuf

    gobject-introspection

    gtk3

    gtk4

    python3Packages.pygobject3

  ];
@@ -35,14 +34,13 @@ python3Packages.buildPythonApplication rec { 


  preFixup = ''

    gappsWrapperArgs+=(

      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}"

      --prefix XDG_DATA_DIRS : "${gtk4}/share/gsettings-schemas/${gtk4.name}"

    )

  '';



  doCheck = false;



  meta = with lib; {

    broken = stdenv.isDarwin;

    description = "A graphical client for the SoulSeek peer-to-peer system";

    longDescription = ''

      Nicotine+ aims to be a pleasant, free and open source (FOSS) alternative

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -33617,8 +33617,6 @@ with pkgs; 
    webkitgtk = webkitgtk_6_0;

  };













  nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { };



























  nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { };





























  nixos-shell = callPackage ../tools/virtualization/nixos-shell { };