Unverified Commit 5072a442 authored by Emily's avatar Emily Committed by GitHub
Browse files

chromium: replace `systemd` with `systemdLibs` (#441286)

parents 0afc9b3d 551a4e6a

pkgs/applications/networking/browsers/chromium/common.nix

+4 −8
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ 
  ungoogled-chromium,

  # Optional dependencies:

  libgcrypt ? null, # cupsSupport

  systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,

  systemd,

  systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,

  systemdLibs,

}:



buildFun:
@@ -370,7 +370,7 @@ let 
      libffi

      libevdev

    ]

    ++ lib.optional systemdSupport systemd

    ++ lib.optional systemdSupport systemdLibs

    ++ lib.optionals cupsSupport [

      libgcrypt

      cups
@@ -427,7 +427,7 @@ let 
      libffi

      libevdev

    ]

    ++ lib.optional systemdSupport systemd

    ++ lib.optional systemdSupport systemdLibs

    ++ lib.optionals cupsSupport [

      libgcrypt

      cups
@@ -686,10 +686,6 @@ let 
            '${glibc}/share/locale/'



      ''

      + lib.optionalString systemdSupport ''

        sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \

          device/udev_linux/udev?_loader.cc

      ''

      + ''

        # Allow to put extensions into the system-path.

        sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc