dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #95748 from corngood/p4v

Browse Source 
p4v: 2017.3.1601999 -> 2020.1.1966006
This commit is contained in:
Dmitry Kalinkin 2020-08-19 19:00:56 -07:00 committed by GitHub
commit 86b9cafcfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,16 @@
{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl_1_0_2, xkeyboard_config, wrapQtAppsHook }: { stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebengine, qtwebkit, openssl, xkeyboard_config, patchelfUnstable, wrapQtAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "p4v"; pname = "p4v";
version = "2017.3.1601999"; version = "2020.1.1966006";
src = fetchurl { src = fetchurl {
url = "https://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz"; url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/p4v.tgz";
sha256 = "9ded42683141e1808535ec3e87d3149f890315c192d6e97212794fd54862b9a4"; sha256 = "0zc70d7jgdrd2jli338n1h05hgb7jmmv8hvq205wh78vvllrlv10";
}; };
dontBuild = true; dontBuild = true;
nativeBuildInputs = [ wrapQtAppsHook ]; nativeBuildInputs = [ patchelfUnstable wrapQtAppsHook ];
ldLibraryPath = lib.makeLibraryPath [ ldLibraryPath = lib.makeLibraryPath [
stdenv.cc.cc.lib stdenv.cc.cc.lib
@ -18,26 +18,33 @@ stdenv.mkDerivation rec {
qtmultimedia qtmultimedia
qtscript qtscript
qtsensors qtsensors
qtwebengine
qtwebkit qtwebkit
openssl_1_0_2 openssl
]; ];
dontWrapQtApps = true; dontWrapQtApps = true;
installPhase = '' installPhase = ''
mkdir $out mkdir $out
cp -r bin $out cp -r bin $out
mkdir -p $out/lib/p4v mkdir -p $out/lib
cp -r lib/p4v/P4VResources $out/lib/p4v cp -r lib/P4VResources $out/lib
for f in $out/bin/*.bin ; do for f in $out/bin/*.bin ; do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f patchelf --set-rpath $ldLibraryPath --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f
# combining this with above breaks rpath (patchelf bug?)
patchelf --add-needed libstdc++.so $f \
--clear-symbol-version _ZNSt20bad_array_new_lengthD1Ev \
--clear-symbol-version _ZTVSt20bad_array_new_length \
--clear-symbol-version _ZTISt20bad_array_new_length \
$f
wrapQtApp $f \ wrapQtApp $f \
--suffix LD_LIBRARY_PATH : ${ldLibraryPath} \
--suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb
done done
''; '';
dontFixup = true;
meta = { meta = {
description = "Perforce Visual Client"; description = "Perforce Visual Client";
homepage = "https://www.perforce.com"; homepage = "https://www.perforce.com";

6
pkgs/development/tools/misc/patchelf/unstable.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "patchelf-${version}"; name = "patchelf-${version}";
version = "2020-06-03"; version = "2020-07-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "patchelf"; repo = "patchelf";
rev = "4aff679d9eaa1a3ec0228901a4e79b57361b4094"; rev = "126372b636733b160e693c9913e871f6755c02e";
sha256 = "1i47z2dl6pgv5krl58lwy3xs327jmhy9cni3b8yampab1kh9ad1l"; sha256 = "07cn40ypys5pyc3jfgxvqj7qk5v6m2rr5brnpmxdsl1557ryx226";
}; };
# Drop test that fails on musl (?) # Drop test that fails on musl (?)