public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lighttable: use lib.getLib systemd instead of systemd.lib

Browse Source 
This will pick the `lib` output if it exists, otherwise default to `out`.
This commit is contained in:
Florian Klink 2020-08-12 20:10:30 +02:00
parent a88186b4a2
commit 6c8d0d1de7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/lighttable/default.nix
View File

@ -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 , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf
, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify , 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 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 \ 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 "/lib/x86_64-linux-gnu" "$out/share/LightTable" \
--replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable" --replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable"