public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #71301 from nathyong/p4v-openssl-patch

Browse Source 
p4v: explicitly depend on openssl 1.0 series
This commit is contained in:
Robert Hensing 2019-11-04 14:35:43 +01:00 committed by GitHub
commit 64a8f2e48d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/version-management/p4v/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
pname = "p4v"; pname = "p4v";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
qtscript qtscript
qtsensors qtsensors
qtwebkit qtwebkit
openssl openssl_1_0_2
]; ];
dontWrapQtApps = true; dontWrapQtApps = true;
@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
homepage = https://www.perforce.com; homepage = https://www.perforce.com;
license = stdenv.lib.licenses.unfreeRedistributable; license = stdenv.lib.licenses.unfreeRedistributable;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = [ stdenv.lib.maintainers.nioncode ]; maintainers = with stdenv.lib.maintainers; [ nathyong nioncode ];
}; };
} }