diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-09-04 20:54:57 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-09-04 20:54:57 +0400 |
| commit | a3b9bf6c87f1423ffbc20ae07a21977aaa19b436 (patch) | |
| tree | 53794bcefba911a7e845d7f272341d8a4159d00d /pkgs/desktops | |
| parent | 3bc8f9ad02506aef39f25c0ea627c37d4535f141 (diff) | |
| parent | 8f1623b38bd3569dba6d86cf7281deef0c7758c4 (diff) | |
| download | nixlib-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.tar nixlib-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.tar.gz nixlib-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.tar.bz2 nixlib-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.tar.lz nixlib-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.tar.xz nixlib-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.tar.zst nixlib-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.zip | |
Merge pull request #3653 from iyzsong/nixos/xfce4-mixer
nixos: don't set variables for gstreamer-0.10 (fix #3652)
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/xfce/applications/xfce4-mixer.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index 2b0f729c0a35..f486373ee17d 100644 --- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base, gtk -, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique?null }: +{ stdenv, fetchurl, pkgconfig, intltool, makeWrapper +, glib, gstreamer, gst_plugins_base, gtk +, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null +}: let # The usual Gstreamer plugins package has a zillion dependencies @@ -23,13 +25,13 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk - libxfce4util libxfce4ui xfce4panel xfconf libunique + libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper ]; postInstall = '' - mkdir -p $out/nix-support - echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages + wrapProgram "$out/bin/xfce4-mixer" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; meta = { |