From 79d46f0a28e0a5fc2068f76f68e06a4d86ad6c93 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Sat, 27 Oct 2018 15:11:35 -0700 Subject: [PATCH 1/2] vlc: shrink runtime closure size by removing CONFIGURE_LINE --- pkgs/applications/video/vlc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b08ff812ace4..06a53ead3baa 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -72,6 +72,11 @@ stdenv.mkDerivation rec { "--with-kde-solid=$out/share/apps/solid/actions" ] ++ optional onlyLibVLC "--disable-vlc"; + # Remove runtime dependencies on libraries + postConfigure = '' + sed -i 's|^#define CONFIGURE_LINE.*$|#define CONFIGURE_LINE ""|g' config.h + ''; + meta = with stdenv.lib; { description = "Cross-platform media player and streaming server"; homepage = http://www.videolan.org/vlc/; From 0cf647fe628407f7283fc7e62fc4a610945eeda9 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Sat, 27 Oct 2018 18:03:37 -0700 Subject: [PATCH 2/2] vlc: remove references to the Qt development headers --- pkgs/applications/video/vlc/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 06a53ead3baa..6cba5236a5f1 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -12,6 +12,7 @@ , withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null , jackSupport ? false , fetchpatch +, removeReferencesTo }: with stdenv.lib; @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { ] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optional jackSupport libjack2; - nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ]; enableParallelBuilding = true; @@ -60,10 +61,14 @@ stdenv.mkDerivation rec { /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 = '' find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' $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