diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2022-11-19 16:12:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-19 16:12:07 +0100 |
| commit | bf337d217df7446228ee43cd726020cd83b27578 (patch) | |
| tree | 199cda75c69c579f6fc2853498f0e8ba19f7cc10 /pkgs/servers | |
| parent | fa703b9329a80bb5401ac843a24da913e0750a68 (diff) | |
| parent | 1769484633a6e7b07fab61a78bf0e9894cea3670 (diff) | |
Merge pull request #201889 from BeneSim/photoprism-change-tests
photoprism: add valid passthru test
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/photoprism/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/photoprism/libtensorflow.nix | 30 |
2 files changed, 19 insertions, 15 deletions
diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/servers/photoprism/default.nix index 4c5fb08c30dfb..678f30c372d06 100644 --- a/pkgs/servers/photoprism/default.nix +++ b/pkgs/servers/photoprism/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, nixosTests, makeWrapper }: +{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, makeWrapper, testers }: let version = "221102-905925b4d"; @@ -74,7 +74,7 @@ stdenv.mkDerivation { runHook postInstall ''; - passthru.tests.photoprism = nixosTests.photoprism; + passthru.tests.version = testers.testVersion { package = pkgs.photoprism; }; meta = with lib; { homepage = "https://photoprism.app"; diff --git a/pkgs/servers/photoprism/libtensorflow.nix b/pkgs/servers/photoprism/libtensorflow.nix index 869f9fc8da1c0..e1c8f9338cc8b 100644 --- a/pkgs/servers/photoprism/libtensorflow.nix +++ b/pkgs/servers/photoprism/libtensorflow.nix @@ -15,12 +15,14 @@ stdenv.mkDerivation rec { aarch64-linux = "sha256-qnj4vhSWgrk8SIjzIH1/4waMxMsxMUvqdYZPaSaUJRk="; }.${system}; - url = let - systemName = { - x86_64-linux = "amd64"; - aarch64-linux = "arm64"; - }.${system}; - in "https://dl.photoprism.app/tensorflow/${systemName}/libtensorflow-${systemName}-${version}.tar.gz"; + url = + let + systemName = { + x86_64-linux = "amd64"; + aarch64-linux = "arm64"; + }.${system}; + in + "https://dl.photoprism.app/tensorflow/${systemName}/libtensorflow-${systemName}-${version}.tar.gz"; }) # Upstream tensorflow tarball (with .h's photoprism's tarball is missing) (fetchurl { @@ -49,13 +51,15 @@ stdenv.mkDerivation rec { ''; # Patch library to use our libc, libstdc++ and others - patchPhase = let - rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc.lib ]; - in '' - chmod -R +w lib - patchelf --set-rpath "${rpath}:$out/lib" lib/libtensorflow.so - patchelf --set-rpath "${rpath}" lib/libtensorflow_framework.so - ''; + patchPhase = + let + rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc.lib ]; + in + '' + chmod -R +w lib + patchelf --set-rpath "${rpath}:$out/lib" lib/libtensorflow.so + patchelf --set-rpath "${rpath}" lib/libtensorflow_framework.so + ''; buildPhase = '' # Write pkg-config file. |