diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
| commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
| tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch | |
| parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
| parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
| download | nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.zip | |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch')
| -rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch deleted file mode 100644 index 39dbc7a3ed0..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch +++ /dev/null @@ -1,16 +0,0 @@ -We have to run `xpidl', but we need to provide it with the right IDL -directory. With GNU IceCat 3 (and possibly Firefox 3), this happens to be -"$(pkg-config --variable=idldir libxul)/stable". - ---- mplayerplug-in-3.55/Makefile.in 2008-01-03 01:20:33.000000000 +0100 -+++ mplayerplug-in-3.55/Makefile.in 2008-09-29 22:47:20.000000000 +0200 -@@ -46,7 +46,7 @@ datadir=@datadir@ - LOCALEDIR=$(datadir)/locale - MOZILLA_HOME=@MOZILLA_HOME@ - GECKO_XPIDL=@GECKO_XPIDL@ --GECKO_IDLDIR=@GECKO_IDLDIR@ -+GECKO_IDLDIR=@GECKO_IDLDIR@/stable - - PIXMAPS=pixmaps/logo.xpm pixmaps/progress_left.xpm pixmaps/progress_right.xpm \ - pixmaps/progress_fill.xpm pixmaps/progress_middle.xpm - |