summary refs log tree commit diff
path: root/pkgs/applications/version-management/p4v
diff options
context:
space:
mode:
authorNathan Yong <nathyong@users.noreply.github.com>2019-10-18 09:26:28 +1100
committerNathan Yong <nathyong@users.noreply.github.com>2019-10-18 09:26:28 +1100
commit1ced63da766965bdda53675a12627401c42a50cc (patch)
tree0789c8d6882d68a0f3ca1aa8ba5388efd7dbe676 /pkgs/applications/version-management/p4v
parentf57d39855f66fd9d4fa798e489dd4f6fdaf772a1 (diff)
downloadnixpkgs-1ced63da766965bdda53675a12627401c42a50cc.tar
nixpkgs-1ced63da766965bdda53675a12627401c42a50cc.tar.gz
nixpkgs-1ced63da766965bdda53675a12627401c42a50cc.tar.bz2
nixpkgs-1ced63da766965bdda53675a12627401c42a50cc.tar.lz
nixpkgs-1ced63da766965bdda53675a12627401c42a50cc.tar.xz
nixpkgs-1ced63da766965bdda53675a12627401c42a50cc.tar.zst
nixpkgs-1ced63da766965bdda53675a12627401c42a50cc.zip
p4v: explicitly depend on openssl 1.0 series
The 2017.3 version of p4v is linked against `libssl.so.1.0.0`.  Since
the default openssl in NixOS 2019.09 has been changed to openssl 1.1,
the p4v package must now import the openssl_1_0_2 derivation.
Diffstat (limited to 'pkgs/applications/version-management/p4v')
-rw-r--r--pkgs/applications/version-management/p4v/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix
index 0020c8c2189..317cbfde85b 100644
--- a/pkgs/applications/version-management/p4v/default.nix
+++ b/pkgs/applications/version-management/p4v/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, wrapQtAppsHook }:
+{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl_1_0_2, xkeyboard_config, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "p4v";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       qtscript
       qtsensors
       qtwebkit
-      openssl
+      openssl_1_0_2
   ];
 
   dontWrapQtApps = true;
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.perforce.com;
     license = stdenv.lib.licenses.unfreeRedistributable;
     platforms = [ "x86_64-linux" ];
-    maintainers = [ stdenv.lib.maintainers.nioncode ];
+    maintainers = with stdenv.lib.maintainers; [ nathyong nioncode ];
   };
 }