about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/mozilla-plugins
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/networking/browsers/mozilla-plugins')
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix2
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix6
6 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index 32e4366a4e46e..e8841a0ab6fbe 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -15,7 +15,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "bluejeans-${version}";
+  pname = "bluejeans";
 
   version = "2.180.71.8";
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index e8ffa71446842..772ca926cd756 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,7 +73,7 @@ let
       "";
 in
 stdenv.mkDerivation rec {
-  name = "flashplayer-${version}";
+  pname = "flashplayer";
   version = "32.0.0.238";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 29a01840555d2..2d2d2a6910069 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -49,7 +49,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "flashplayer-standalone-${version}";
+  pname = "flashplayer-standalone";
   version = "32.0.0.238";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
index 30bae8792c2e0..101ae99d6659b 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "fribid-${version}";
+  pname = "fribid";
   version = "1.0.4";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "https://fribid.se/releases/source/${name}.tar.bz2";
+    url = "https://fribid.se/releases/source/${pname}-${version}.tar.bz2";
     sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649";
   };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 8a25036c70a32..bde4ce15d7c0c 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -46,7 +46,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "google-talk-plugin-${version}";
+  pname = "google-talk-plugin";
 
   # You can get the upstream version and SHA-1 hash from the following URLs:
   # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1'
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
index c6c1d6a334cde..fd956f62327e2 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, firefox, libX11, xorgproto }:
 
 stdenv.mkDerivation rec {
-  name = "mozplugger-${version}";
+  pname = "mozplugger";
   version = "2.1.6";
 
   src = fetchurl {
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     cp mozplugger.so "$out/lib/mozilla/plugins"
     cp mozplugger.7 "$out/share/man/man7"
 
-    mkdir -p "$out/share/${name}/plugin"
-    ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${name}/plugin"
+    mkdir -p "$out/share/${pname}-${version}/plugin"
+    ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${pname}-${version}/plugin"
   '';
 
   meta = {