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

Merge pull request #133348 from marius851000/portmod-update

Browse Source 
portmod: 2.0_beta9 -> 2.0.3
This commit is contained in:
Sandro 2021-08-10 15:27:59 +02:00 committed by GitHub
commit da5f8ba58c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/games/portmod/default.nix
View File

@ -1,22 +1,22 @@
{ lib, callPackage, python3Packages, fetchFromGitLab, cacert,
rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip,
jre, makeWrapper, tr-patcher, tes3cmd }:
jre, makeWrapper, tr-patcher, tes3cmd, fetchpatch }:
let
version = "2.0_beta9";
version = "2.0.3";
src = fetchFromGitLab {
owner = "portmod";
repo = "Portmod";
rev = "v${version}";
sha256 = "0a598rb0z6gsdyr4n0lc0yc583njjii07p6vxw75xsh7292vxksc";
sha256 = "sha256-vMdyaI1Ps7bFoRvwdVNVG9vPFEiGb7CPvKEWfxiM128=";
};
portmod-rust = rustPlatform.buildRustPackage rec {
inherit src version;
pname = "portmod-rust";
cargoHash = "sha256-7Ce+EIbZuOur7iGOUXNWiXReuZO54LQJu+sJPw1CJGg=";
cargoHash = "sha256-tAghZmlg34jHr8gtNgL3MQ8EI7K6/TfDcTbBjxdWLr0=";
nativeBuildInputs = [ python3Packages.python ];
@ -44,9 +44,18 @@ python3Packages.buildPythonApplication rec {
prePatch = ''
substituteInPlace setup.py \
--replace "from setuptools_rust import Binding, RustExtension" "" \
--replace "RustExtension(\"portmod.portmod\", binding=Binding.PyO3, strip=True)" ""
--replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=True)" ""
'';
patches = [
(fetchpatch {
# fix error when symlinks are present in the path (https://gitlab.com/portmod/portmod/-/merge_requests/393)
# happen with ~/.nix-profile
url = "https://gitlab.com/portmod/portmod/-/merge_requests/393.patch";
sha256 = "sha256-XHifwD/Nh7UiMZdvSNudVF7qpBOpjGTKSr4VVdJqUdA=";
})
];
propagatedBuildInputs = with python3Packages; [
setuptools-scm
setuptools
@ -61,6 +70,7 @@ python3Packages.buildPythonApplication rec {
redbaron
patool
packaging
fasteners
];
checkInputs = with python3Packages; [
@ -68,7 +78,7 @@ python3Packages.buildPythonApplication rec {
] ++ bin-programs;
preCheck = ''
cp ${portmod-rust}/lib/libportmod.so portmod/portmod.so
cp ${portmod-rust}/lib/libportmod.so portmodlib/portmod.so
export HOME=$(mktemp -d)
'';
@ -79,11 +89,14 @@ python3Packages.buildPythonApplication rec {
"test_execute_network_permissions"
"test_execute_permissions_bleed"
"test_git"
"test_sync"
"test_manifest"
"test_add_repo"
];
# for some reason, installPhase doesn't copy the compiled binary
postInstall = ''
cp ${portmod-rust}/lib/libportmod.so $out/${python3Packages.python.sitePackages}/portmod/portmod.so
cp ${portmod-rust}/lib/libportmod.so $out/${python3Packages.python.sitePackages}/portmodlib/portmod.so
makeWrapperArgs+=("--prefix" "GIT_SSL_CAINFO" ":" "${cacert}/etc/ssl/certs/ca-bundle.crt" \
"--prefix" "PATH" ":" "${lib.makeBinPath bin-programs }")