Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

venera: init at 1.0.8 #359919

Merged
merged 2 commits into from
Dec 3, 2024
Merged

venera: init at 1.0.8 #359919

merged 2 commits into from
Dec 3, 2024

Conversation

aucub
Copy link
Contributor

@aucub aucub commented Nov 28, 2024

A comic reader that support reading local and network comics. https://github.com/venera-app/venera

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Nov 29, 2024
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4897

@lafrenierejm
Copy link
Contributor

Are all three commits necessary for venera? It looks like you might have accidentally pushed some unrelated commits to this branch; de8305c, for example, only touches hiddify-app.

@github-actions github-actions bot added 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 10.rebuild-linux: 1-10 labels Dec 1, 2024
@ofborg ofborg bot added 10.rebuild-linux: 1-10 10.rebuild-linux: 1 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Dec 1, 2024
@aucub aucub changed the title venera: init at 1.0.7 venera: init at 1.0.8 Dec 3, 2024
@Aleksanaa
Copy link
Member

Could you try something like

patch
diff --git a/pkgs/development/compilers/dart/package-source-builders/sqlite3_flutter_libs/CMakeLists.txt b/pkgs/dev
elopment/compilers/dart/package-source-builders/sqlite3_flutter_libs/CMakeLists.txt
new file mode 100644
index 000000000000..4e8a182593f0
--- /dev/null
+++ b/pkgs/development/compilers/dart/package-source-builders/sqlite3_flutter_libs/CMakeLists.txt
@@ -0,0 +1,24 @@
+set(PROJECT_NAME "sqlite3_flutter_libs")
+project(${PROJECT_NAME} LANGUAGES C CXX)
+
+set(PLUGIN_NAME "sqlite3_flutter_libs_plugin")
+
+find_package(PkgConfig REQUIRED)
+
+pkg_check_modules(SQLITE REQUIRED sqlite3)
+
+add_library(SQLITE)
+
+add_library(${PLUGIN_NAME} SHARED
+  "sqlite3_flutter_libs_plugin.cc"
+)
+
+target_compile_features(${PLUGIN_NAME} PUBLIC cxx_std_14)
+target_compile_options(${PLUGIN_NAME} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
+
+set_target_properties(${PLUGIN_NAME} PROPERTIES
+  CXX_VISIBILITY_PRESET hidden)
+target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL)
+target_include_directories(${PLUGIN_NAME} INTERFACE
+  "${CMAKE_CURRENT_SOURCE_DIR}/include")
+target_link_libraries(${PLUGIN_NAME} PRIVATE flutter)
diff --git a/pkgs/development/compilers/dart/package-source-builders/sqlite3_flutter_libs/default.nix b/pkgs/development/compilers/dart/package-source-builders/sqlite3_flutter_libs/default.nix
index faa5cb756a83..9fddae06d2ce 100644
--- a/pkgs/development/compilers/dart/package-source-builders/sqlite3_flutter_libs/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/sqlite3_flutter_libs/default.nix
@@ -1,27 +1,14 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-}:
+{ stdenv }:
 
 { version, src, ... }:
 
-let
-  sqlite-autoconf = fetchurl {
-    url = "https://sqlite.org/2024/sqlite-autoconf-3470000.tar.gz";
-    hash = "sha256-g+shpvamSfUG34vTqrhaCPdVbO7V29jep0PqAD/DqVc=";
-  };
-in
 stdenv.mkDerivation {
   pname = "sqlite3_flutter_libs";
   inherit version src;
   inherit (src) passthru;
 
   postPatch = ''
-    substituteInPlace linux/CMakeLists.txt \
-      --replace-warn "https://sqlite.org/2024/sqlite-autoconf-3470000.tar.gz" "file://${sqlite-autoconf}" \
-      --replace-warn "https://sqlite.org/2024/sqlite-autoconf-3460000.tar.gz" "file://${sqlite-autoconf}" \
-      --replace-warn "https://www.sqlite.org/2022/sqlite-autoconf-3390000.tar.gz" "file://${sqlite-autoconf}"
+    cp ${./CMakeLists.txt} linux/CMakeLists.txt
   '';
 
   installPhase = ''

My network is poor today, cannot pull all dependencies, so no luck

@aucub aucub force-pushed the venera branch 2 times, most recently from 64b8097 to 54d8418 Compare December 3, 2024 16:37
@Aleksanaa
Copy link
Member

So does it work?

@Aleksanaa
Copy link
Member

@ofborg build venera

@Aleksanaa Aleksanaa merged commit b222156 into NixOS:master Dec 3, 2024
18 of 21 checks passed
@aucub aucub deleted the venera branch December 3, 2024 18:56
];

extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should not use pname here

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants