summary refs log tree commit diff
path: root/pkgs/applications/video/devede/default.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2016-08-16 22:51:21 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2016-08-16 22:52:37 +0200
commit5a501bd828b19e9cef4589b3b9dc2852401a2882 (patch)
tree49be7194446f7258b197ff0f29fc00d8eb939f02 /pkgs/applications/video/devede/default.nix
parent6b23bd99a31a450fede964206153ddd5ac76a22f (diff)
downloadnixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar
nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.gz
nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.bz2
nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.lz
nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.xz
nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.zst
nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.zip
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.
Diffstat (limited to 'pkgs/applications/video/devede/default.nix')
-rw-r--r--pkgs/applications/video/devede/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index ce44377260e..824ef9661b8 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, stdenv, fetchurl, pythonPackages, buildPythonApplication, pygtk, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }:
+{ pkgs, stdenv, fetchurl, pythonPackages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }:
 
 let
-  inherit (pythonPackages) dbus;
+  inherit (pythonPackages) dbus-python buildPythonApplication pygtk;
 
 in buildPythonApplication rec {
   name = "devede-3.23.0";
@@ -14,7 +14,7 @@ in buildPythonApplication rec {
 
   buildInputs = [ ffmpeg ];
 
-  propagatedBuildInputs = [ pygtk dbus ffmpeg mplayer dvdauthor vcdimager cdrkit ];
+  propagatedBuildInputs = [ pygtk dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit ];
 
   postPatch = ''
     substituteInPlace devede --replace "/usr/share/devede" "$out/share/devede"