jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7070 from oxij/more-cleanups

Browse Source 
More cleanups
This commit is contained in:
Arseniy Seroka 2015-03-30 17:35:38 +03:00
commit 63f442a590
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/mailreaders/sylpheed/default.nix
View File

@ -1,8 +1,9 @@
{ sslSupport ? true { stdenv, fetchurl, pkgconfig, gtk
, gpgSupport ? false
, stdenv, fetchurl, pkgconfig, gtk
, openssl ? null , openssl ? null
, gpgme ? null , gpgme ? null
, sslSupport ? true
, gpgSupport ? true
}: }:
with stdenv.lib; with stdenv.lib;

13
pkgs/top-level/all-packages.nix
View File

@ -11198,19 +11198,17 @@ let
normalize = callPackage ../applications/audio/normalize { }; normalize = callPackage ../applications/audio/normalize { };
mplayer = callPackage ../applications/video/mplayer { mplayer = callPackage ../applications/video/mplayer ({
pulseSupport = config.pulseaudio or false; pulseSupport = config.pulseaudio or false;
vdpauSupport = config.mplayer.vdpauSupport or false; } // (config.mplayer or {}));
};
mplayer2 = callPackage ../applications/video/mplayer2 { mplayer2 = callPackage ../applications/video/mplayer2 {
ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386 ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386
}; };
MPlayerPlugin = browser: MPlayerPlugin = browser:
import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { callPackage ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {
inherit browser; inherit browser;
inherit fetchurl stdenv pkgconfig gettext;
inherit (xlibs) libXpm; inherit (xlibs) libXpm;
# !!! should depend on MPlayer # !!! should depend on MPlayer
}; };
@ -11803,10 +11801,7 @@ let
swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { };
sslSupport = true;
gpgSupport = true;
};
symlinks = callPackage ../tools/system/symlinks { }; symlinks = callPackage ../tools/system/symlinks { };