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

encryptr: 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:21:10 +02:00
parent d6f3b96a5d
commit 135158c8c6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/security/encryptr/default.nix
View File

@ -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 , pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes
, libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr , libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr
, expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify , 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 cp -v {encryptr-bin,icudtl.dat,nw.pak} $out/bin
mv -v $out/bin/encryptr{-bin,} mv -v $out/bin/encryptr{-bin,}
cp -v lib* $out/lib 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) \ patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath $out/lib:${rpath} \ --set-rpath $out/lib:${rpath} \