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/editors/lighttable | |
| parent | ec7a4ddd92e19e0084a07448671cd79d974cd818 (diff) | |
| download | nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.tar nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.gz nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.bz2 nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.lz nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.xz nixpkgs-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.zst nixpkgs-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/editors/lighttable')
| -rw-r--r-- | pkgs/applications/editors/lighttable/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 38a01db0c5b..72ecbbc5983 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev +, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, libudev }: let @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $out/LightTable/ltbin - ln -sf ${udev.libudev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 + ln -sf ${libudev.out}/lib/libudev.so.1 $out/LightTable/libudev.so.0 makeWrapper $out/LightTable/ltbin $out/bin/lighttable \ --prefix "LD_LIBRARY_PATH" : $out/LightTable |