Unverified Commit 6fa58b7d authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

xfce.*: Move away from mkXfceDerivation (part 3) (#473345)

parents 28aacdd8 c5b77058

doc/release-notes/rl-2605.section.md

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ 


<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->



- `xfce.mkXfceDerivation` has been deprecated, please use `stdenv.mkDerivation`

  directly. You can migrate by adding `pkg-config`, `xfce4-dev-tools`, and

  `wrapGAppsHook3` to your `nativeBuildInputs` and `--enable-maintainer-mode`

  to your `configureFlags`.



- `corepack_latest` has been removed, as Corepack is no longer distributed with Node.js.



- `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained.

pkgs/desktops/xfce/core/xfce4-power-manager/default.nix

+32 −5
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  mkXfceDerivation,

  fetchFromGitLab,

  gettext,

  pkg-config,

  wayland-scanner,

  xfce4-dev-tools,

  wrapGAppsHook3,

  gtk3,

  libnotify,

  libxfce4ui,
@@ -12,17 +17,27 @@ 
  wlr-protocols,

  xfconf,

  xfce4-panel,

  gitUpdater,

}:



mkXfceDerivation {

  category = "xfce";

stdenv.mkDerivation (finalAttrs: {

  pname = "xfce4-power-manager";

  version = "4.20.0";



  sha256 = "sha256-qKUdrr+giLzNemhT3EQsOKTSiIx50NakmK14Ak7ZOCE=";

  src = fetchFromGitLab {

    domain = "gitlab.xfce.org";

    owner = "xfce";

    repo = "xfce4-power-manager";

    tag = "xfce4-power-manager-${finalAttrs.version}";

    hash = "sha256-qKUdrr+giLzNemhT3EQsOKTSiIx50NakmK14Ak7ZOCE=";

  };



  nativeBuildInputs = [

    gettext

    pkg-config

    wayland-scanner

    xfce4-dev-tools

    wrapGAppsHook3

  ];



  buildInputs = [
@@ -46,8 +61,20 @@ mkXfceDerivation { 
    substituteInPlace src/xfpm-suspend.c --replace-fail "SBINDIR" "\"/run/current-system/sw/bin\""

  '';



  configureFlags = [ "--enable-maintainer-mode" ];

  enableParallelBuilding = true;



  passthru.updateScript = gitUpdater {

    rev-prefix = "xfce4-power-manager-";

    odd-unstable = true;

  };



  meta = {

    description = "Power manager for the Xfce Desktop Environment";

    homepage = "https://gitlab.xfce.org/xfce/xfce4-power-manager";

    license = lib.licenses.gpl2Plus;

    mainProgram = "xfce4-power-manager";

    platforms = lib.platforms.linux;

    teams = [ lib.teams.xfce ];

  };

}
 
})

pkgs/desktops/xfce/core/xfce4-session/default.nix

+37 −7
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  mkXfceDerivation,

  fetchFromGitLab,

  gettext,

  pkg-config,

  xfce4-dev-tools,

  wrapGAppsHook3,

  polkit,

  exo,

  libxfce4util,
@@ -12,15 +17,27 @@ 
  gtk-layer-shell,

  glib,

  libwnck,

  xfce4-session,

  gitUpdater,

}:



mkXfceDerivation {

  category = "xfce";

stdenv.mkDerivation (finalAttrs: {

  pname = "xfce4-session";

  version = "4.20.3";



  sha256 = "sha256-HfVspmAkjuGgoI87VHNHFGZP17ZA0b31llY93gUtWxs=";

  src = fetchFromGitLab {

    domain = "gitlab.xfce.org";

    owner = "xfce";

    repo = "xfce4-session";

    tag = "xfce4-session-${finalAttrs.version}";

    hash = "sha256-HfVspmAkjuGgoI87VHNHFGZP17ZA0b31llY93gUtWxs=";

  };



  nativeBuildInputs = [

    gettext

    pkg-config

    xfce4-dev-tools

    wrapGAppsHook3

  ];



  buildInputs = [

    exo
@@ -37,14 +54,27 @@ mkXfceDerivation { 
  ];



  configureFlags = [

    "--enable-maintainer-mode"

    "--with-xsession-prefix=${placeholder "out"}"

    "--with-wayland-session-prefix=${placeholder "out"}"

  ];



  passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";

  enableParallelBuilding = true;



  passthru = {

    xinitrc = "${finalAttrs.finalPackage}/etc/xdg/xfce4/xinitrc";

    updateScript = gitUpdater {

      rev-prefix = "xfce4-session-";

      odd-unstable = true;

    };

  };



  meta = {

    description = "Session manager for Xfce";

    homepage = "https://gitlab.xfce.org/xfce/xfce4-session";

    license = lib.licenses.gpl2Plus;

    mainProgram = "xfce4-session";

    platforms = lib.platforms.linux;

    teams = [ lib.teams.xfce ];

  };

}
 
})

pkgs/desktops/xfce/core/xfce4-settings/default.nix

+32 −5
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  mkXfceDerivation,

  fetchFromGitLab,

  gettext,

  pkg-config,

  xfce4-dev-tools,

  wayland-scanner,

  wrapGAppsHook3,

  exo,

  garcon,

  gtk3,
@@ -23,17 +28,27 @@ 
  xf86inputlibinput,

  colord,

  withColord ? true,

  gitUpdater,

}:



mkXfceDerivation {

  category = "xfce";

stdenv.mkDerivation (finalAttrs: {

  pname = "xfce4-settings";

  version = "4.20.2";



  sha256 = "sha256-hx1ilXPcwWWDwNR/k2b+9vR5aCv9UlPR0d42OE6JxEk=";

  src = fetchFromGitLab {

    domain = "gitlab.xfce.org";

    owner = "xfce";

    repo = "xfce4-settings";

    tag = "xfce4-settings-${finalAttrs.version}";

    hash = "sha256-hx1ilXPcwWWDwNR/k2b+9vR5aCv9UlPR0d42OE6JxEk=";

  };



  nativeBuildInputs = [

    gettext

    pkg-config

    xfce4-dev-tools

    wayland-scanner

    wrapGAppsHook3

  ];



  buildInputs = [
@@ -56,6 +71,7 @@ mkXfceDerivation { 
  ++ lib.optionals withColord [ colord ];



  configureFlags = [

    "--enable-maintainer-mode"

    "--enable-pluggable-dialogs"

    "--enable-sound-settings"

    (lib.enableFeature withXrandr "xrandr")
@@ -63,8 +79,19 @@ mkXfceDerivation { 
  ++ lib.optionals withUpower [ "--enable-upower-glib" ]

  ++ lib.optionals withColord [ "--enable-colord" ];



  enableParallelBuilding = true;



  passthru.updateScript = gitUpdater {

    rev-prefix = "xfce4-settings-";

    odd-unstable = true;

  };



  meta = {

    description = "Settings manager for Xfce";

    homepage = "https://gitlab.xfce.org/xfce/xfce4-settings";

    license = lib.licenses.gpl2Plus;

    mainProgram = "xfce4-settings-manager";

    platforms = lib.platforms.linux;

    teams = [ lib.teams.xfce ];

  };

}
 
})

pkgs/desktops/xfce/core/xfconf/default.nix

+35 −5
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  mkXfceDerivation,

  fetchFromGitLab,

  gettext,

  gobject-introspection,

  perl,

  pkg-config,

  vala,

  xfce4-dev-tools,

  wrapGAppsNoGuiHook,

  libxfce4util,

  glib,

  withIntrospection ?

    lib.meta.availableOn stdenv.hostPlatform gobject-introspection

    && stdenv.hostPlatform.emulatorAvailable buildPackages,

  buildPackages,

  gitUpdater,

}:



mkXfceDerivation {

  category = "xfce";

stdenv.mkDerivation (finalAttrs: {

  pname = "xfconf";

  version = "4.20.0";



  sha256 = "sha256-U+Sk7ubBr1ZD1GLQXlxrx0NQdhV/WpVBbnLcc94Tjcw=";

  outputs = [

    "out"

    "dev"

  ];



  src = fetchFromGitLab {

    domain = "gitlab.xfce.org";

    owner = "xfce";

    repo = "xfconf";

    tag = "xfconf-${finalAttrs.version}";

    hash = "sha256-U+Sk7ubBr1ZD1GLQXlxrx0NQdhV/WpVBbnLcc94Tjcw=";

  };



  nativeBuildInputs = [

    gettext

    perl

    pkg-config

    xfce4-dev-tools

    wrapGAppsNoGuiHook

  ]

  ++ lib.optionals withIntrospection [

    gobject-introspection
@@ -32,9 +51,20 @@ mkXfceDerivation { 


  propagatedBuildInputs = [ glib ];



  configureFlags = [ "--enable-maintainer-mode" ];

  enableParallelBuilding = true;



  passthru.updateScript = gitUpdater {

    rev-prefix = "xfconf-";

    odd-unstable = true;

  };



  meta = {

    description = "Simple client-server configuration storage and query system for Xfce";

    homepage = "https://gitlab.xfce.org/xfce/xfconf";

    mainProgram = "xfconf-query";

    license = lib.licenses.gpl2Plus;

    platforms = lib.platforms.linux;

    teams = [ lib.teams.xfce ];

  };

}
 
})