diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-31 18:01:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-31 18:01:09 +0000 |
| commit | 65cbf5e637a35594fa5776a036562b41211cbdfe (patch) | |
| tree | 202bfa95b59d65f3c1a57873062c196323dd3921 /pkgs/desktops | |
| parent | bfb057546cb8e77576f0c6d59280d6d25a33cf40 (diff) | |
| parent | e5f6890469d8d1c3f5f58370fc9474cf246913fa (diff) | |
| download | nixlib-65cbf5e637a35594fa5776a036562b41211cbdfe.tar nixlib-65cbf5e637a35594fa5776a036562b41211cbdfe.tar.gz nixlib-65cbf5e637a35594fa5776a036562b41211cbdfe.tar.bz2 nixlib-65cbf5e637a35594fa5776a036562b41211cbdfe.tar.lz nixlib-65cbf5e637a35594fa5776a036562b41211cbdfe.tar.xz nixlib-65cbf5e637a35594fa5776a036562b41211cbdfe.tar.zst nixlib-65cbf5e637a35594fa5776a036562b41211cbdfe.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/enlightenment/efl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/enlightenment/enlightenment/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/lomiri/services/hfd-service/default.nix | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index a15975872df4..34485cf87363 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.26.3"; + version = "1.27.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2fg6oP2TNPRN7rTklS3A5RRGg6+seG/uvOYDCVFhfRU="; + sha256 = "sha256-PfuZ+8wmjAvHl+L4PoxQPvneZihPQLOBu1l6CBhcAPQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 7818df245f69..9b5abbd8a564 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "enlightenment"; - version = "0.25.4"; + version = "0.26.0"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VttdIGuCG5qIMdJucT5BCscLIlWm9D/N98Ae794jt6I="; + sha256 = "sha256-EbbvBnG+X+rWiL9VTDCiocaDSTrRDF/jEV/7RlVCToQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lomiri/services/hfd-service/default.nix b/pkgs/desktops/lomiri/services/hfd-service/default.nix index cffedb0af623..e9ae4a0fe2db 100644 --- a/pkgs/desktops/lomiri/services/hfd-service/default.nix +++ b/pkgs/desktops/lomiri/services/hfd-service/default.nix @@ -31,10 +31,11 @@ stdenv.mkDerivation (finalAttrs: { # Queries pkg-config via pkg_get_variable, can't override prefix substituteInPlace init/CMakeLists.txt \ - --replace "\''${SYSTEMD_SYSTEM_DIR}" "$out/lib/systemd/system" + --replace 'pkg_get_variable(SYSTEMD_SYSTEM_DIR systemd systemdsystemunitdir)' 'set(SYSTEMD_SYSTEM_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/system)' substituteInPlace CMakeLists.txt \ - --replace 'pkg_get_variable(AS_INTERFACES_DIR accountsservice interfacesdir)' 'set(AS_INTERFACES_DIR "''${CMAKE_INSTALL_DATADIR}/accountsservice/interfaces")' \ - --replace 'DESTINATION ''${DBUS_INTERFACES_DIR}' 'DESTINATION ${placeholder "out"}/''${DBUS_INTERFACES_DIR}' + --replace 'pkg_get_variable(AS_INTERFACES_DIR accountsservice interfacesdir)' 'set(AS_INTERFACES_DIR "''${CMAKE_INSTALL_FULL_DATADIR}/accountsservice/interfaces")' \ + --replace '../../dbus-1/interfaces' "\''${CMAKE_INSTALL_PREFIX}/\''${DBUS_INTERFACES_DIR}" \ + --replace 'DESTINATION ''${DBUS_INTERFACES_DIR}' 'DESTINATION ''${CMAKE_INSTALL_PREFIX}/''${DBUS_INTERFACES_DIR}' substituteInPlace src/CMakeLists.txt \ --replace "\''${DBUS_INTERFACES_DIR}/org.freedesktop.Accounts.xml" '${accountsservice}/share/dbus-1/interfaces/org.freedesktop.Accounts.xml' ''; |