From 6c8d0d1de710ccabaf4d5eac11670cacc20965e8 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:10:30 +0200 Subject: [PATCH] lighttable: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/applications/editors/lighttable/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 26c5ee42152..abf55b42c55 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem +{ stdenv, lib, fetchurl, zlib, glib, alsaLib, makeDesktopItem , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify }: @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { mv $out/share/LightTable/light $out/bin/light - ln -sf ${systemd.lib}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0 + ln -sf ${lib.getLib systemd}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0 substituteInPlace $out/bin/light \ - --replace "/usr/lib/x86_64-linux-gnu" "${systemd.lib}/lib" \ + --replace "/usr/lib/x86_64-linux-gnu" "${lib.getLib systemd}/lib" \ --replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \ --replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable"