From b07bc129cb8e467c311bf2ef42038202d2b2c2db Mon Sep 17 00:00:00 2001 From: Nicolas Schneider Date: Mon, 12 Mar 2018 09:12:45 +0100 Subject: p4v: init at 2017.3.1601999 --- .../version-management/p4v/default.nix | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/applications/version-management/p4v/default.nix (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix new file mode 100644 index 000000000000..f86362c94d5b --- /dev/null +++ b/pkgs/applications/version-management/p4v/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, makeWrapper }: + +stdenv.mkDerivation rec { + name = "p4v-${version}"; + version = "2017.3.1601999"; + + src = fetchurl { + url = "http://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz"; + sha256 = "f317607f1bc8877db01ff020b8b0857c2d0f8600474d152749264aea0be66b21"; + }; + + dontBuild = true; + nativeBuildInputs = [makeWrapper]; + + ldLibraryPath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + qtbase + qtmultimedia + qtscript + qtsensors + qtwebkit + openssl + ]; + + installPhase = '' + mkdir $out + cp -r bin $out + mkdir -p $out/lib/p4v + cp -r lib/p4v/P4VResources $out/lib/p4v + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/p4merge.bin + + for f in $out/bin/*.bin ; do + wrapProgram $f \ + --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ + --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb \ + --suffix QT_PLUGIN_PATH : ${qtbase.bin}/${qtbase.qtPluginPrefix} + done + ''; + + meta = { + description = "Perforce Visual Client"; + homepage = http://www.perforce.com; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; + maintainers = [ stdenv.lib.maintainers.nioncode ]; + }; +} -- cgit 1.4.1 From 7d767d3ac3c3821cf7e1b799a88477b7c59557e8 Mon Sep 17 00:00:00 2001 From: Nicolas Schneider Date: Sun, 18 Mar 2018 15:06:51 +0100 Subject: p4v: patch the interpreter for all binaries, not just p4merge.bin --- pkgs/applications/version-management/p4v/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index f86362c94d5b..85eb3a2ab4fe 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/p4v cp -r lib/p4v/P4VResources $out/lib/p4v - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/p4merge.bin - for f in $out/bin/*.bin ; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f + wrapProgram $f \ --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb \ -- cgit 1.4.1 From be40a8b2f61d48688e8401a7593e656028122511 Mon Sep 17 00:00:00 2001 From: Nicolas Schneider Date: Sun, 18 Mar 2018 15:08:26 +0100 Subject: p4v: use https links --- pkgs/applications/version-management/p4v/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 85eb3a2ab4fe..27e029d39d1e 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2017.3.1601999"; src = fetchurl { - url = "http://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz"; + url = "https://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz"; sha256 = "f317607f1bc8877db01ff020b8b0857c2d0f8600474d152749264aea0be66b21"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Perforce Visual Client"; - homepage = http://www.perforce.com; + homepage = https://www.perforce.com; license = stdenv.lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.nioncode ]; -- cgit 1.4.1