diff options
| author | Florian Klink <flokli@flokli.de> | 2020-08-12 20:16:44 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-08-13 20:51:40 +0200 |
| commit | d512c0879864060b7cf4e02342e8ed60e5ae7bd9 (patch) | |
| tree | 7f482536b73cb8fe4a3ec60596eb1f056f178b45 /pkgs/development/tools/node-webkit | |
| parent | 8b5deb080d3481907ec4faee52d50d300a1a5b24 (diff) | |
| download | nixpkgs-d512c0879864060b7cf4e02342e8ed60e5ae7bd9.tar nixpkgs-d512c0879864060b7cf4e02342e8ed60e5ae7bd9.tar.gz nixpkgs-d512c0879864060b7cf4e02342e8ed60e5ae7bd9.tar.bz2 nixpkgs-d512c0879864060b7cf4e02342e8ed60e5ae7bd9.tar.lz nixpkgs-d512c0879864060b7cf4e02342e8ed60e5ae7bd9.tar.xz nixpkgs-d512c0879864060b7cf4e02342e8ed60e5ae7bd9.tar.zst nixpkgs-d512c0879864060b7cf4e02342e8ed60e5ae7bd9.zip | |
nwjs_0_12: use lib.getLib systemd instead of systemd.lib
This will pick the `lib` output if it exists, otherwise default to `out`.
Diffstat (limited to 'pkgs/development/tools/node-webkit')
| -rw-r--r-- | pkgs/development/tools/node-webkit/nw12.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 307e123bf77..ffd2a78f509 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper +{ stdenv, lib, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify}: @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc - ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc |