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

p4v: 2024.2/2606884 -> 2026.1/2933292 (#518167)

Browse Source
This commit is contained in:
Peder Bergebakken Sundt
2026-07-14 21:52:59 +00:00
committed by GitHub
parent 747cac2427 05eb5e1867
commit 1484bb05f5
3 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/p4/p4v/libs.patch
+54
View File
@@ -0,0 +1,54 @@
diff -ru bin-before/p4admin bin-after/p4admin
--- before/bin/p4admin 2026-05-05 13:38:26.865099841 -0700
+++ after/bin/p4admin 2026-05-05 13:40:01.377761574 -0700
@@ -43,14 +43,6 @@
progname=`basename "$realfullprogname"`
prefix=`topdir "$realfullprogname"`
- # check for symbolic links for libssl.so and libcrypto.so
- if [ ! -f $prefix/lib/libssl.so ]; then
- p4vlibssl=$( find $prefix/lib/libssl.so.* )
- ln -s $p4vlibssl $prefix/lib/libssl.so;
- p4vlibcrypto=$( find $prefix/lib/libcrypto.so.* )
- ln -s $p4vlibcrypto $prefix/lib/libcrypto.so;
- fi
-
XDG_SESSION_TYPE=
QT_QPA_PLATFORM=xcb
P4VRES=$prefix/lib/P4VResources
diff -ru bin-before/p4merge bin-after/p4merge
--- before/bin/p4merge 2026-05-05 13:38:26.865161794 -0700
+++ after/bin/p4merge 2026-05-05 13:39:51.100750813 -0700
@@ -43,14 +43,6 @@
progname=`basename "$realfullprogname"`
prefix=`topdir "$realfullprogname"`
- # check for symbolic links for libssl.so and libcrypto.so
- if [ ! -f $prefix/lib/libssl.so ]; then
- p4vlibssl=$( find $prefix/lib/libssl.so.* )
- ln -s $p4vlibssl $prefix/lib/libssl.so;
- p4vlibcrypto=$( find $prefix/lib/libcrypto.so.* )
- ln -s $p4vlibcrypto $prefix/lib/libcrypto.so;
- fi
-
XDG_SESSION_TYPE=
QT_QPA_PLATFORM=xcb
P4VRES=$prefix/lib/P4VResources
diff -ru bin-before/p4v bin-after/p4v
--- before/bin/p4v 2026-05-05 13:38:26.865192103 -0700
+++ after/bin/p4v 2026-05-05 13:39:20.028718286 -0700
@@ -43,14 +43,6 @@
progname=`basename "$realfullprogname"`
prefix=`topdir "$realfullprogname"`
- # check for symbolic links for libssl.so and libcrypto.so
- if [ ! -f $prefix/lib/libssl.so ]; then
- p4vlibssl=$( find $prefix/lib/libssl.so.* )
- ln -s $p4vlibssl $prefix/lib/libssl.so;
- p4vlibcrypto=$( find $prefix/lib/libcrypto.so.* )
- ln -s $p4vlibcrypto $prefix/lib/libcrypto.so;
- fi
-
XDG_SESSION_TYPE=
QT_QPA_PLATFORM=xcb
P4VRES=$prefix/lib/P4VResources
pkgs/by-name/p4/p4v/linux.nix
+4
View File
@@ -77,6 +77,10 @@ let
# Don't wrap the Qt apps; upstream has its own wrapper scripts.
dontWrapQtApps = true;
patches = [
./libs.patch # Fixes issues with bundled libraries that we've stripped out
];
postPatch = ''
rm -r lib/plugins lib/libQt6* lib/libssl* lib/libicu* lib/libcrypto*
'';
pkgs/by-name/p4/p4v/package.nix
+5 -5
View File
@@ -10,12 +10,12 @@ let
# Upstream replaces minor versions, so use archived URLs.
srcs = rec {
x86_64-linux = fetchurl {
url = "https://web.archive.org/web/20240612193642id_/https://ftp.perforce.com/perforce/r24.2/bin.linux26x86_64/p4v.tgz";
sha256 = "sha256-HA99fHcmgli/vVnr0M8ZJEsaZ2ZLzpG3M8S77oDYJyE=";
url = "https://web.archive.org/web/20260414052921/https://filehost.perforce.com/perforce/r26.1/bin.linux26x86_64/p4v.tgz";
sha256 = "sha256-89Xz9dxAeLGOOr90K0CdlxjrfIf9vUmyZV3tzWspWdQ=";
};
aarch64-darwin = fetchurl {
url = "https://web.archive.org/web/20240612194532id_/https://ftp.perforce.com/perforce/r24.2/bin.macosx12u/P4V.dmg";
sha256 = "sha256-PS7gfDdWspyL//YWLkrsGi5wh6SIeAry2yef1/V0d6o=";
url = "https://web.archive.org/web/20260414052748/https://filehost.perforce.com/perforce/r26.1/bin.macosx12u/P4V.dmg";
sha256 = "sha256-8MBLS6EQOVenxZ1Uv75kPzU8aO2AldmxkwOz+JcBRpY=";
};
# this is universal
x86_64-darwin = aarch64-darwin;
@@ -29,7 +29,7 @@ let
in
mkDerivation {
pname = "p4v";
version = "2024.2/2606884";
version = "2026.1/2933292";
src =
srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");