diff options
-rw-r--r-- | pkgs/games/steam/runtime-wrapped.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/udev/145.nix | 53 | ||||
-rw-r--r-- | pkgs/os-specific/linux/udev/182.nix | 39 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 1 insertions, 95 deletions
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 38d73f59deec..d9d6e0ecf0d0 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -44,7 +44,7 @@ let libav atk # Only libraries are needed from those two - udev182 + libudev0-shim networkmanager098 # Verified games requirements diff --git a/pkgs/os-specific/linux/udev/145.nix b/pkgs/os-specific/linux/udev/145.nix deleted file mode 100644 index 6dd551e1ce13..000000000000 --- a/pkgs/os-specific/linux/udev/145.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils }: - -assert stdenv ? glibc; - -stdenv.mkDerivation rec { - name = "udev-145"; - - src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2"; - sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv"; - }; - - buildInputs = [gperf pkgconfig glib acl libusb usbutils]; - - configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids"; - - preConfigure = - '' - substituteInPlace extras/keymap/Makefile.in \ - --replace /usr/include ${stdenv.glibc.dev}/include - ''; - - postInstall = - '' - # Install some rules that really should be installed by default. - for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do - cp rules/packages/$i $out/libexec/rules.d/ - done - - # The path to rule_generator.functions in write_cd_rules and - # write_net_rules is broken. Also, don't store the mutable - # persistant rules in /etc/udev/rules.d but in - # /var/lib/udev/rules.d. - for i in $out/libexec/write_cd_rules $out/libexec/write_net_rules; do - substituteInPlace $i \ - --replace /lib/udev $out/libexec \ - --replace /etc/udev/rules.d /var/lib/udev/rules.d - done - - # Don't set PATH to /bin:/sbin; won't work in NixOS. - substituteInPlace $out/libexec/rule_generator.functions \ - --replace 'PATH=' '#PATH=' - - # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the - # environment of the caller. - sed '3,4d' -i $out/libexec/firmware.sh - ''; - - meta = { - homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html; - description = "Udev manages the /dev filesystem"; - }; -} diff --git a/pkgs/os-specific/linux/udev/182.nix b/pkgs/os-specific/linux/udev/182.nix deleted file mode 100644 index 33a4907c7caa..000000000000 --- a/pkgs/os-specific/linux/udev/182.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, pkgconfig -, pciutils, utillinux, kmod, usbutils, gperf -}: - -assert stdenv ? glibc; - -stdenv.mkDerivation rec { - name = "udev-182"; - - src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2"; - sha256 = "143qvm0kij26j2l5icnch4x38fajys6li7j0c5mpwi6kqmc8hqx0"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ utillinux kmod usbutils #glib gobjectIntrospection - gperf - ]; - - configureFlags = [ "--with-pci-ids-path=${pciutils}/share/pci.ids" - "--disable-gudev" - "--disable-introspection" - ]; - - postPatch = '' - sed -i 's:input.h:input-event-codes.h:' Makefile.in - sed -i '20a#include <stdint.h>' src/mtd_probe/mtd_probe.h - ''; - - NIX_LDFLAGS = [ "-lrt" ]; - - meta = with stdenv.lib; { - homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html; - description = "Udev manages the /dev filesystem"; - platforms = platforms.linux; - license = licenses.gpl2; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a73e0ad17810..d9e462a208fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11669,8 +11669,6 @@ in eudev = callPackage ../os-specific/linux/eudev {}; - # libudev.so.0 - udev182 = callPackage ../os-specific/linux/udev/182.nix { }; libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { }; udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { }; |