summary refs log tree commit diff
path: root/pkgs/applications/audio
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-01-07 15:43:09 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2016-01-07 16:00:52 +0100
commit0397da7ec4e3e29253e194c7373b9d14ed70d331 (patch)
tree28e4035d2ea9418c87dd4e5e48c85b979acd2716 /pkgs/applications/audio
parentb6d84748b913c9ffc9937ec64ca868cffa8797b4 (diff)
downloadnixlib-0397da7ec4e3e29253e194c7373b9d14ed70d331.tar
nixlib-0397da7ec4e3e29253e194c7373b9d14ed70d331.tar.gz
nixlib-0397da7ec4e3e29253e194c7373b9d14ed70d331.tar.bz2
nixlib-0397da7ec4e3e29253e194c7373b9d14ed70d331.tar.lz
nixlib-0397da7ec4e3e29253e194c7373b9d14ed70d331.tar.xz
nixlib-0397da7ec4e3e29253e194c7373b9d14ed70d331.tar.zst
nixlib-0397da7ec4e3e29253e194c7373b9d14ed70d331.zip
mopidy: Fix fetching songs over HTTPS
The gstreamer plugin needs glib-networking to support HTTPS. Refactored
to use wrapGAppsHook to wrap the gstreamer plugins and glib-networking.
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r--pkgs/applications/audio/mopidy/default.nix15
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index 91fc9d6f3fc9..a6209884aa3a 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pythonPackages, pygobject, gst_python
-, gst_plugins_good, gst_plugins_base, gst_plugins_ugly
+{ stdenv, fetchurl, pythonPackages, pygobject, gst_python, wrapGAppsHook
+, glib_networking, gst_plugins_good, gst_plugins_base, gst_plugins_ugly
 }:
 
 pythonPackages.buildPythonPackage rec {
@@ -12,16 +12,19 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "1xfyg8xqgnrb98wx7a4fzr4vlzkffjhkc1s36ka63rwmx86vqhyw";
   };
 
+  buildInputs = [
+    wrapGAppsHook gst_plugins_base gst_plugins_good gst_plugins_ugly glib_networking
+  ];
+
   propagatedBuildInputs = with pythonPackages; [
-    gst_python pygobject pykka tornado requests2 gst_plugins_base gst_plugins_good gst_plugins_ugly
+    gst_python pygobject pykka tornado requests2
   ];
 
   # There are no tests
   doCheck = false;
 
-  postInstall = ''
-    wrapProgram $out/bin/mopidy \
-      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH")
   '';
 
   meta = with stdenv.lib; {