From 0cf647fe628407f7283fc7e62fc4a610945eeda9 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Sat, 27 Oct 2018 18:03:37 -0700 Subject: vlc: remove references to the Qt development headers --- pkgs/applications/video/vlc/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/video/vlc') diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 06a53ead3ba..6cba5236a5f 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 -- cgit 1.4.1