diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index e624b88060c0..ebad8f5d1809 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { pname = "caja"; version = "1.28.0"; + outputs = [ + "out" + "man" + ]; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; diff --git a/pkgs/desktops/mate/caja/with-extensions.nix b/pkgs/desktops/mate/caja/with-extensions.nix index 6c1e7c873174..6a380e6b377b 100644 --- a/pkgs/desktops/mate/caja/with-extensions.nix +++ b/pkgs/desktops/mate/caja/with-extensions.nix @@ -15,13 +15,14 @@ let in stdenv.mkDerivation { pname = "${caja.pname}-with-extensions"; - version = caja.version; + inherit (caja) version outputs; src = null; nativeBuildInputs = [ glib wrapGAppsHook3 + xorg.lndir ]; buildInputs = @@ -41,7 +42,8 @@ stdenv.mkDerivation { runHook preInstall mkdir -p $out - ${xorg.lndir}/bin/lndir -silent ${caja} $out + lndir -silent ${caja.out} $out + lndir -silent ${caja.man} $out dbus_service_path="share/dbus-1/services/org.mate.freedesktop.FileManager1.service" rm -f $out/share/applications/* "$out/$dbus_service_path" diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 4564b721d5a9..8fc32a979130 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { pname = "mate-applets"; version = "1.28.1"; + outputs = [ + "out" + "man" + ]; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 614bd9b13390..61b8e9d63fe3 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" + "man" ]; src = fetchurl { diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index dfa4db8ddc89..4145d871b2cb 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { pname = "mate-media"; version = "1.28.1"; + outputs = [ + "out" + "man" + ]; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index e3dce623800b..1a4d90eae1e1 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { pname = "mate-netbook"; version = "1.26.0"; + outputs = [ + "out" + "man" + ]; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 027faa67898f..9c1f6b253905 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { pname = "mate-notification-daemon"; version = "1.28.5"; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "mate-desktop"; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 49320fa936ca..dfd49c595617 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { pname = "mate-panel"; version = "1.28.7"; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "mate-desktop"; diff --git a/pkgs/desktops/mate/mate-panel/with-applets.nix b/pkgs/desktops/mate/mate-panel/with-applets.nix index 98aa4ecd39ea..9e81c5715ee6 100644 --- a/pkgs/desktops/mate/mate-panel/with-applets.nix +++ b/pkgs/desktops/mate/mate-panel/with-applets.nix @@ -16,11 +16,15 @@ let in stdenv.mkDerivation { pname = "${mate-panel.pname}-with-applets"; - version = mate-panel.version; + inherit (mate-panel) version outputs; src = null; - paths = [ mate-panel ] ++ selectedApplets; + paths = [ + mate-panel.out + mate-panel.man + ] + ++ selectedApplets; passAsFile = [ "paths" ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 86259bfbaf76..9e612bea20a9 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { pname = "mate-power-manager"; version = "1.28.1"; + outputs = [ + "out" + "man" + ]; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 5faecb26a132..9f87fef5ea6f 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { pname = "mate-settings-daemon"; version = "1.28.0"; + outputs = [ + "out" + "man" + ]; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; diff --git a/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix b/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix index b8ad5e984845..097f429460c2 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "${mate.mate-settings-daemon.pname}-wrapped"; - version = mate.mate-settings-daemon.version; + inherit (mate.mate-settings-daemon) version outputs; nativeBuildInputs = [ wrapGAppsHook3 @@ -25,6 +25,9 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/etc/xdg/autostart cp ${mate.mate-settings-daemon}/etc/xdg/autostart/mate-settings-daemon.desktop $out/etc/xdg/autostart + + mkdir -p $out/share/man + cp -r ${mate.mate-settings-daemon.man}/share/man/* $out/share/man/ ''; postFixup = '' @@ -32,7 +35,7 @@ stdenv.mkDerivation { makeWrapper ${mate.mate-settings-daemon}/libexec/mate-settings-daemon $out/libexec/mate-settings-daemon \ "''${gappsWrapperArgs[@]}" substituteInPlace $out/etc/xdg/autostart/mate-settings-daemon.desktop \ - --replace "${mate.mate-settings-daemon}/libexec/mate-settings-daemon" "$out/libexec/mate-settings-daemon" + --replace-fail "${mate.mate-settings-daemon}/libexec/mate-settings-daemon" "$out/libexec/mate-settings-daemon" ''; meta = mate.mate-settings-daemon.meta // { diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index ac75a4848548..077babd23557 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { pname = "mate-utils"; version = "1.28.0"; + outputs = [ + "out" + "man" + ]; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";