summary refs log tree commit diff
path: root/pkgs/applications/video/vlc/default.nix
diff options
context:
space:
mode:
authorAndrew Dunham <andrew@du.nham.ca>2018-10-27 18:03:37 -0700
committerAndrew Dunham <andrew@du.nham.ca>2018-10-27 18:03:37 -0700
commit0cf647fe628407f7283fc7e62fc4a610945eeda9 (patch)
treeb944ea48add9950ef1885f01e28d386081d329ef /pkgs/applications/video/vlc/default.nix
parent79d46f0a28e0a5fc2068f76f68e06a4d86ad6c93 (diff)
downloadnixpkgs-0cf647fe628407f7283fc7e62fc4a610945eeda9.tar
nixpkgs-0cf647fe628407f7283fc7e62fc4a610945eeda9.tar.gz
nixpkgs-0cf647fe628407f7283fc7e62fc4a610945eeda9.tar.bz2
nixpkgs-0cf647fe628407f7283fc7e62fc4a610945eeda9.tar.lz
nixpkgs-0cf647fe628407f7283fc7e62fc4a610945eeda9.tar.xz
nixpkgs-0cf647fe628407f7283fc7e62fc4a610945eeda9.tar.zst
nixpkgs-0cf647fe628407f7283fc7e62fc4a610945eeda9.zip
vlc: remove references to the Qt development headers
Diffstat (limited to 'pkgs/applications/video/vlc/default.nix')
-rw-r--r--pkgs/applications/video/vlc/default.nix9
1 files changed, 7 insertions, 2 deletions
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