diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 20:52:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-04 10:03:53 +0200 |
| commit | b44d846990d779f7201f114076a2f2bcacdc91c5 (patch) | |
| tree | 9a6f766bfb04765e1095be811aab38b94f88bd5d /pkgs/applications/networking/browsers | |
| parent | ec7a4ddd92e19e0084a07448671cd79d974cd818 (diff) | |
| download | nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.tar nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.gz nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.bz2 nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.lz nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.xz nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.zst nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.zip | |
udev: complete rework
- systemd puts all into one output now (except for man),
because I wasn't able to fix all systemd/udev refernces
for NixOS to work well
- libudev is now by default *copied* into another path,
which is what most packages will use as build input :-)
- pkgs.udev = [ libudev.out libudev.dev ]; because there are too many
references that just put `udev` into build inputs (to rewrite them all),
also this made "${udev}/foo" fail at *evaluation* time
so it's easier to catch and change to something more specific
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 070859b902d9..2f3a8738cc54 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -8,7 +8,7 @@ , libusb1, libexif, pciutils , python, pythonPackages, perl, pkgconfig -, nspr, udev, kerberos +, nspr, libudev, kerberos , utillinux, alsaLib , bison, gperf , glib, gtk, dbus_glib @@ -107,7 +107,7 @@ let buildInputs = defaultDependencies ++ [ which python perl pkgconfig - nspr udev + nspr libudev (if useOpenSSL then openssl else nss) utillinux alsaLib bison gperf kerberos @@ -135,7 +135,7 @@ let s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| }' chrome/utility/media_galleries/image_metadata_extractor.cc - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${udev.libudev}/lib/\1!' \ + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${libudev.out}/lib/\1!' \ device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ |