From 5a501bd828b19e9cef4589b3b9dc2852401a2882 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Aug 2016 22:51:21 +0200 Subject: Remove top-level dbus_python and pythonDBus. See #11567. Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus- python as that's the name upstream uses. There is a small rebuild but I couldn't figure out the actual cause. --- pkgs/os-specific/linux/pam_usb/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/pam_usb') diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index 67d9894a2a0..a96e951bf9b 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,8 +1,9 @@ -{stdenv, fetchurl, makeWrapper, useSetUID, dbus, libxml2, pam, pkgconfig, pmount, python, pythonDBus}: +{stdenv, fetchurl, makeWrapper, useSetUID, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages}: let pmountBin = useSetUID pmount "/bin/pmount"; pumountBin = useSetUID pmount "/bin/pumount"; + inherit (pythonPackages) python dbus-python; in stdenv.mkDerivation rec { @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { for prog in $out/bin/pamusb-conf $out/bin/pamusb-agent; do substituteInPlace $prog --replace '/usr/bin/env python' '/bin/python' wrapProgram $prog \ - --prefix PYTHONPATH : "$(toPythonPath ${pythonDBus})" + --prefix PYTHONPATH : "$(toPythonPath ${dbus-python})" done ''; -- cgit 1.4.1