diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-05 18:59:00 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-05 19:17:14 +0200 |
| commit | 78178d5854901e1b17a14bce3fe43515984b7b91 (patch) | |
| tree | 350b6cb98c5a86ce3a15c18032afd6acdf28ccd7 /pkgs/development/tools/node-webkit | |
| parent | 5d8c54746066eb454bee5c10ba93b3a9e078bf45 (diff) | |
| download | nixpkgs-78178d5854901e1b17a14bce3fe43515984b7b91.tar nixpkgs-78178d5854901e1b17a14bce3fe43515984b7b91.tar.gz nixpkgs-78178d5854901e1b17a14bce3fe43515984b7b91.tar.bz2 nixpkgs-78178d5854901e1b17a14bce3fe43515984b7b91.tar.lz nixpkgs-78178d5854901e1b17a14bce3fe43515984b7b91.tar.xz nixpkgs-78178d5854901e1b17a14bce3fe43515984b7b91.tar.zst nixpkgs-78178d5854901e1b17a14bce3fe43515984b7b91.zip | |
systemd: Separate lib output
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid of libudev (which just contained a copy of libudev.so and the udev headers). It thus reduces the closure size of all packages that (indirectly) depend on libsystemd, of which there are quite a few (for instance, PulseAudio and dbus). For example, it reduces the closure of Blender from 430.8 to 400.8 MiB.
Diffstat (limited to 'pkgs/development/tools/node-webkit')
| -rw-r--r-- | pkgs/development/tools/node-webkit/nw11.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/node-webkit/nw12.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/node-webkit/nw9.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index 925c32bd65d..1fcda13dab8 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, libudev, libcap +, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap , libnotify}: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot - ln -s ${libudev.out}/lib/libudev.so $out/share/node-webkit/libudev.so.0 + ln -s ${systemd.lib}/lib/libudev.so $out/share/node-webkit/libudev.so.0 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index f0ede1e5237..18fdf7bca3b 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, libudev, libcap +, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap , libnotify}: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -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 ${libudev.out}/lib/libudev.so $out/share/nwjs/libudev.so.0 + ln -s ${systemd.lib}/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 diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index ad2cda34cd8..db5d6ee6b6f 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, libudev }: +, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd }: let bits = if stdenv.system == "x86_64-linux" then "x64" else "ia32"; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot - ln -s ${libudev.out}/lib/libudev.so $out/share/node-webkit/libudev.so.0 + ln -s ${systemd.lib}/lib/libudev.so $out/share/node-webkit/libudev.so.0 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot |