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

Merge pull request #49315 from andrew-d/andrew/vlc-shrink-closure

Browse Source 
vlc: shrink runtime closure size by removing CONFIGURE_LINE
This commit is contained in:
Joachim F 2018-10-28 01:35:33 +00:00 committed by GitHub
commit aa4005f7f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/video/vlc/default.nix
View File

@ -12,6 +12,7 @@
, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null , withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null
, jackSupport ? false , jackSupport ? false
, fetchpatch , fetchpatch
, removeReferencesTo
}: }:
with stdenv.lib; with stdenv.lib;
@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
++ optional jackSupport libjack2; ++ optional jackSupport libjack2;
nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -60,10 +61,14 @@ stdenv.mkDerivation rec {
/usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype
''; '';
# https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830 # - Touch plugins (plugins cache keyed off mtime and file size:
# https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830
# - Remove references to the Qt development headers (used in error messages)
postFixup = '' postFixup = ''
find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';'
$out/lib/vlc/vlc-cache-gen $out/vlc/plugins $out/lib/vlc/vlc-cache-gen $out/vlc/plugins
remove-references-to -t "${qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so
''; '';
# Most of the libraries are auto-detected so we don't need to set a bunch of # Most of the libraries are auto-detected so we don't need to set a bunch of
@ -72,6 +77,11 @@ stdenv.mkDerivation rec {
"--with-kde-solid=$out/share/apps/solid/actions" "--with-kde-solid=$out/share/apps/solid/actions"
] ++ optional onlyLibVLC "--disable-vlc"; ] ++ optional onlyLibVLC "--disable-vlc";
# Remove runtime dependencies on libraries
postConfigure = ''
sed -i 's|^#define CONFIGURE_LINE.*$|#define CONFIGURE_LINE "<removed>"|g' config.h
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Cross-platform media player and streaming server"; description = "Cross-platform media player and streaming server";
homepage = http://www.videolan.org/vlc/; homepage = http://www.videolan.org/vlc/;