about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorCosima Neidahl <opna2608@protonmail.com>2024-01-21 02:18:49 +0100
committerGitHub <noreply@github.com>2024-01-21 02:18:49 +0100
commit6bd1f8c6ffbb93c3e74ebcf2e80da070d9c1545f (patch)
treecae70483bbb97dedac74e9ba6f9be68c42e1c6a5 /pkgs/desktops
parentf17b161181c818918958940750bebfcc60f9d4f8 (diff)
parent7cfee78a37a1ad0becb3d9728be1041d011f419d (diff)
Merge pull request #281816 from OPNA2608/update/trust-store
lomiri.trust-store: unstable-2023-10-17 -> 0-unstable-2023-12-27
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/lomiri/development/trust-store/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix
index 477cdd0511f86..845e2d0ee59d3 100644
--- a/pkgs/desktops/lomiri/development/trust-store/default.nix
+++ b/pkgs/desktops/lomiri/development/trust-store/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "trust-store";
-  version = "unstable-2023-10-17";
+  version = "0-unstable-2023-12-27";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/trust-store";
-    rev = "7aa7ab5b7f3843e24c13ae6d9b8607455296d60e";
-    hash = "sha256-j+4FZzbG3qh1pGRapFuuMiwT4Lv9P6Ji9/3Z0uGvXmw=";
+    rev = "c91e5ac54c4032525f930f0651d673ad3a1095a2";
+    hash = "sha256-zqs40tKo2AOd9yL2Xfbk52Uh8hy4uT1XDT6YtKufAaY=";
   };
 
   outputs = [
@@ -86,8 +86,10 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     # Requires mirclient API, unavailable in Mir 2.x
     # https://gitlab.com/ubports/development/core/trust-store/-/issues/2
-    "-DTRUST_STORE_MIR_AGENT_ENABLED=OFF"
-    "-DTRUST_STORE_ENABLE_DOC_GENERATION=ON"
+    (lib.cmakeBool "TRUST_STORE_MIR_AGENT_ENABLED" false)
+    (lib.cmakeBool "TRUST_STORE_ENABLE_DOC_GENERATION" true)
+    # error: moving a temporary object prevents copy elision
+    (lib.cmakeBool "ENABLE_WERROR" false)
   ];
 
   # Not working