Merge pull request #94354 from flokli/systemd-246
systemd: 245.6 -> 246
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
, lib
|
||||
, udev
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
@@ -72,7 +73,7 @@ let
|
||||
'';
|
||||
|
||||
runtimeDependencies = [
|
||||
udev.lib
|
||||
(lib.getLib udev)
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype
|
||||
{ stdenv, lib, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype
|
||||
, pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes
|
||||
, libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr
|
||||
, expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify
|
||||
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
|
||||
cp -v {encryptr-bin,icudtl.dat,nw.pak} $out/bin
|
||||
mv -v $out/bin/encryptr{-bin,}
|
||||
cp -v lib* $out/lib
|
||||
ln -sv ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0
|
||||
ln -sv ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
|
||||
|
||||
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
--set-rpath $out/lib:${rpath} \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, alsaLib, atk, cairo, cups, udev
|
||||
{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev
|
||||
, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3
|
||||
, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook
|
||||
, runtimeShell, gsettings-desktop-schemas }:
|
||||
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
udev.lib
|
||||
(lib.getLib udev)
|
||||
libappindicator-gtk3
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user