summary refs log tree commit diff
path: root/pkgs/development/libraries/qt-5/5.5
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-05 18:59:00 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-05 19:17:14 +0200
commit78178d5854901e1b17a14bce3fe43515984b7b91 (patch)
tree350b6cb98c5a86ce3a15c18032afd6acdf28ccd7 /pkgs/development/libraries/qt-5/5.5
parent5d8c54746066eb454bee5c10ba93b3a9e078bf45 (diff)
downloadnixpkgs-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/libraries/qt-5/5.5')
-rw-r--r--pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix4
-rw-r--r--pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
index 32549c95344..2bffd0a2bd6 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
@@ -1,4 +1,4 @@
-{ qtSubmodule, qtbase, substituteAll, libudev }:
+{ qtSubmodule, qtbase, substituteAll, systemd }:
 
 qtSubmodule {
   name = "qtserialport";
@@ -6,7 +6,7 @@ qtSubmodule {
   patches = [
     (substituteAll {
       src = ./0001-dlopen-serialport-udev.patch;
-      libudev = libudev.out;
+      libudev = systemd.lib;
     })
   ];
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
index 5ccf09515e4..32b07b6c907 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
@@ -1,6 +1,6 @@
 { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors
 , fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt
-, sqlite, libudev, glib, gst_all_1
+, sqlite, systemd, glib, gst_all_1
 , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby
 , substituteAll
 , flashplayerFix ? false
@@ -27,7 +27,7 @@ qtSubmodule {
         };
         dlopen-webkit-udev = substituteAll {
           src = ./0003-dlopen-webkit-udev.patch;
-          libudev = libudev.out;
+          libudev = systemd.lib;
         };
     in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
     ++ [ dlopen-webkit-udev ];