Loading pkgs/applications/editors/eclipse/plugins.nix +6 −6 Original line number Diff line number Diff line Loading @@ -146,12 +146,12 @@ rec { version = "1.3.5.201612301822"; srcFeature = fetchurl { url = "https://github.com/mihnita/ansi-econsole/raw/refs/heads/main/AnsiConSitePublished/features/net.mihai-nita.ansicon_${version}.jar"; url = "https://raw.githubusercontent.com/mihnita/ansi-econsole/8dcf0a2531cbf091310c0e01db1a1310557fc383/AnsiConSitePublished/features/net.mihai-nita.ansicon_${version}.jar"; hash = "sha256-o9hnMuZeohU+AKS+ueU8dWS9HomrnqaKpWYMG5vMeJs="; }; srcPlugin = fetchurl { url = "https://github.com/mihnita/ansi-econsole/raw/refs/heads/main/AnsiConSitePublished/plugins/net.mihai-nita.ansicon.plugin_${version}.jar"; url = "https://raw.githubusercontent.com/mihnita/ansi-econsole/8dcf0a2531cbf091310c0e01db1a1310557fc383/AnsiConSitePublished/plugins/net.mihai-nita.ansicon.plugin_${version}.jar"; hash = "sha256-WK7WxNZHvmMHGycC/12sIKj4wKIhWT8x1Anp3zuggsg="; }; Loading Loading @@ -215,12 +215,12 @@ rec { version = "2.7.3.202502241151"; srcFeature = fetchurl { url = "https://github.com/iloveeclipse/plugins/raw/refs/heads/latest/features/AnyEditTools_${version}.jar"; url = "https://raw.githubusercontent.com/iloveeclipse/plugins/f0560d1c628e0dba776831b1dea98d929515ebe5/features/AnyEditTools_${version}.jar"; hash = "sha256-liEw+H8yTCrYQMe3gVQhJuxPXlSpEs4QwB2yv8n/CiE="; }; srcPlugin = fetchurl { url = "https://github.com/iloveeclipse/plugins/raw/refs/heads/latest/plugins/de.loskutov.anyedit.AnyEditTools_${version}.jar"; url = "https://raw.githubusercontent.com/iloveeclipse/plugins/f0560d1c628e0dba776831b1dea98d929515ebe5/plugins/de.loskutov.anyedit.AnyEditTools_${version}.jar"; hash = "sha256-LrWCWJWZxsnMiBnTwXdWaXUoyXMYpLqXMUkHEOna2kk="; }; Loading Loading @@ -590,12 +590,12 @@ rec { version = "6.9.13.201609291640"; srcFeature = fetchurl { url = "https://github.com/testng-team/testng-eclipse-update-site/raw/refs/heads/main/updatesites/${version}/features/org.testng.eclipse_${version}.jar"; url = "https://raw.githubusercontent.com/testng-team/testng-eclipse-update-site/0eb404d0c65dc0ef25b19145bb44a56326a53da6/updatesites/${version}/features/org.testng.eclipse_${version}.jar"; hash = "sha256-JahgneGUJN4jVxgXdkhhj5/TENXKXG635UO9Q7Vnnws="; }; srcPlugin = fetchurl { url = "https://github.com/testng-team/testng-eclipse-update-site/raw/refs/heads/main/updatesites/${version}/plugins/org.testng.eclipse_${version}.jar"; url = "https://raw.githubusercontent.com/testng-team/testng-eclipse-update-site/0eb404d0c65dc0ef25b19145bb44a56326a53da6/updatesites/${version}/plugins/org.testng.eclipse_${version}.jar"; hash = "sha256-DTE60G+1ZnBT0i6FHuYDQlzwxhwAeXbHN3hgkYbhn8g="; }; Loading pkgs/applications/emulators/mame/default.nix +1 −1 Original line number Diff line number Diff line Loading @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { installPhase = let icon = fetchurl { url = "https://raw.githubusercontent.com/PapirusDevelopmentTeam/papirus-icon-theme/refs/heads/master/Papirus/32x32/apps/mame.svg"; url = "https://raw.githubusercontent.com/PapirusDevelopmentTeam/papirus-icon-theme/4256be4cf56870aa1fbd85c48cafeafa187160e0/Papirus/32x32/apps/mame.svg"; hash = "sha256-s44Xl9UGizmddd/ugwABovM8w35P0lW9ByB69MIpG+E="; }; in Loading pkgs/by-name/bo/boxflat/package.nix +1 −0 Original line number Diff line number Diff line Loading @@ -49,6 +49,7 @@ python3Packages.buildPythonPackage rec { "psutil" "evdev" "pycairo" "pygobject" "PyYAML" ]; Loading pkgs/by-name/el/ela-widget-tools/fix-install-path.patch 0 → 100644 +90 −0 Original line number Diff line number Diff line diff --git a/CMakeLists.txt b/CMakeLists.txt index d04794e..b686747 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,11 +10,6 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>") -#在这里配置QT路径 例如 D:/Qt/6.6.2/msvc2019_64 D:/Qt/5.15.2/msvc2019_64 /home/liniyous/Qt/5.15.2/gcc_64 -SET(QT_SDK_DIR D:/Qt/5.15.2/msvc2019_64 CACHE PATH "QT SDK DIR" FORCE) -message("在CMAKE中配置 QT_SDK_DIR 选项指定QT路径; 当前路径: ${QT_SDK_DIR}") -SET(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/Install CACHE PATH "Installation path" FORCE) - option(BUILD_ELAPACKETIO "Build ElaPacketIO" OFF) list(APPEND CMAKE_PREFIX_PATH ${QT_SDK_DIR}) diff --git a/ElaWidgetTools/CMakeLists.txt b/ElaWidgetTools/CMakeLists.txt index 0f61edd..7b075f1 100644 --- a/ElaWidgetTools/CMakeLists.txt +++ b/ElaWidgetTools/CMakeLists.txt @@ -46,9 +46,9 @@ if (MSVC) set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX "d") endif () -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Widgets ) @@ -63,13 +63,6 @@ endif () install( TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME} - ARCHIVE DESTINATION ${PROJECT_NAME}/lib - LIBRARY DESTINATION ${PROJECT_NAME}/lib - RUNTIME DESTINATION ${PROJECT_NAME}/bin -) -install(TARGETS ${PROJECT_NAME} - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/ElaWidgetToolsExample - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/ElaWidgetToolsExample ) if (MSVC AND NOT LIB_TYPE STREQUAL "STATIC") install( @@ -87,7 +80,7 @@ set(LIB_DIR lib) install( EXPORT ${PROJECT_NAME} FILE ${PROJECT_NAME}Targets.cmake - DESTINATION ${PROJECT_NAME}/lib/cmake + DESTINATION lib/cmake ) include(CMakePackageConfigHelpers) @@ -102,7 +95,6 @@ configure_package_config_file( ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION lib/cmake PATH_VARS INCLUDE_DIRS LIBRARIES LIB_DIR - INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME} ) install( diff --git a/ElaWidgetToolsExample/CMakeLists.txt b/ElaWidgetToolsExample/CMakeLists.txt index 7330ed1..3cd0cc7 100644 --- a/ElaWidgetToolsExample/CMakeLists.txt +++ b/ElaWidgetToolsExample/CMakeLists.txt @@ -41,9 +41,9 @@ else () ) endif () -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) if (WIN32) target_include_directories(${PROJECT_NAME} PUBLIC @@ -93,8 +93,6 @@ endif () include(GNUInstallDirs) install(TARGETS ${PROJECT_NAME} - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME} - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME} ) if (MSVC) install( pkgs/by-name/el/ela-widget-tools/package.nix 0 → 100644 +66 −0 Original line number Diff line number Diff line { fetchFromGitHub, lib, stdenv, cmake, qt6, ... }: stdenv.mkDerivation (finalAttrs: { pname = "ela-widget-tools"; version = "0-unstable-2025-10-30"; src = fetchFromGitHub { owner = "Liniyous"; repo = "ElaWidgetTools"; rev = "c1eed7c23545e61cc63a34f2cc26737c9d563f78"; hash = "sha256-bmByAQKasqJIaX9W8M+cFQppr7ACF07TZAuXb0xgvfU="; }; patches = [ ./fix-install-path.patch ]; # Qt CMake private include path is empty, generate one ourselves postPatch = let includeBaseFor = component: [ "${qt6.qtbase}/include/${component}/${qt6.qtbase.version}" "${qt6.qtbase}/include/${component}/${qt6.qtbase.version}/${component}" ]; includePaths = builtins.concatStringsSep " " ( lib.flatten ( builtins.map includeBaseFor [ "QtCore" "QtGui" "QtWidgets" ] ) ); in '' substituteInPlace ElaWidgetTools/CMakeLists.txt \ --replace-fail \ '${"\${Qt\${QT_VERSION_MAJOR}Widgets_PRIVATE_INCLUDE_DIRS}"}' \ "${includePaths}" ''; nativeBuildInputs = [ cmake qt6.wrapQtAppsHook ]; buildInputs = [ qt6.qtbase ]; postInstall = '' cp -r $out/ElaWidgetTools/* $out/ rm -rf $out/ElaWidgetTools ''; meta = { mainProgram = "ElaWidgetToolsExample"; maintainers = with lib.maintainers; [ xddxdd ]; description = "Fluent-UI For QT-Widget"; homepage = "https://github.com/Liniyous/ElaWidgetTools"; license = lib.licenses.mit; }; }) Loading
pkgs/applications/editors/eclipse/plugins.nix +6 −6 Original line number Diff line number Diff line Loading @@ -146,12 +146,12 @@ rec { version = "1.3.5.201612301822"; srcFeature = fetchurl { url = "https://github.com/mihnita/ansi-econsole/raw/refs/heads/main/AnsiConSitePublished/features/net.mihai-nita.ansicon_${version}.jar"; url = "https://raw.githubusercontent.com/mihnita/ansi-econsole/8dcf0a2531cbf091310c0e01db1a1310557fc383/AnsiConSitePublished/features/net.mihai-nita.ansicon_${version}.jar"; hash = "sha256-o9hnMuZeohU+AKS+ueU8dWS9HomrnqaKpWYMG5vMeJs="; }; srcPlugin = fetchurl { url = "https://github.com/mihnita/ansi-econsole/raw/refs/heads/main/AnsiConSitePublished/plugins/net.mihai-nita.ansicon.plugin_${version}.jar"; url = "https://raw.githubusercontent.com/mihnita/ansi-econsole/8dcf0a2531cbf091310c0e01db1a1310557fc383/AnsiConSitePublished/plugins/net.mihai-nita.ansicon.plugin_${version}.jar"; hash = "sha256-WK7WxNZHvmMHGycC/12sIKj4wKIhWT8x1Anp3zuggsg="; }; Loading Loading @@ -215,12 +215,12 @@ rec { version = "2.7.3.202502241151"; srcFeature = fetchurl { url = "https://github.com/iloveeclipse/plugins/raw/refs/heads/latest/features/AnyEditTools_${version}.jar"; url = "https://raw.githubusercontent.com/iloveeclipse/plugins/f0560d1c628e0dba776831b1dea98d929515ebe5/features/AnyEditTools_${version}.jar"; hash = "sha256-liEw+H8yTCrYQMe3gVQhJuxPXlSpEs4QwB2yv8n/CiE="; }; srcPlugin = fetchurl { url = "https://github.com/iloveeclipse/plugins/raw/refs/heads/latest/plugins/de.loskutov.anyedit.AnyEditTools_${version}.jar"; url = "https://raw.githubusercontent.com/iloveeclipse/plugins/f0560d1c628e0dba776831b1dea98d929515ebe5/plugins/de.loskutov.anyedit.AnyEditTools_${version}.jar"; hash = "sha256-LrWCWJWZxsnMiBnTwXdWaXUoyXMYpLqXMUkHEOna2kk="; }; Loading Loading @@ -590,12 +590,12 @@ rec { version = "6.9.13.201609291640"; srcFeature = fetchurl { url = "https://github.com/testng-team/testng-eclipse-update-site/raw/refs/heads/main/updatesites/${version}/features/org.testng.eclipse_${version}.jar"; url = "https://raw.githubusercontent.com/testng-team/testng-eclipse-update-site/0eb404d0c65dc0ef25b19145bb44a56326a53da6/updatesites/${version}/features/org.testng.eclipse_${version}.jar"; hash = "sha256-JahgneGUJN4jVxgXdkhhj5/TENXKXG635UO9Q7Vnnws="; }; srcPlugin = fetchurl { url = "https://github.com/testng-team/testng-eclipse-update-site/raw/refs/heads/main/updatesites/${version}/plugins/org.testng.eclipse_${version}.jar"; url = "https://raw.githubusercontent.com/testng-team/testng-eclipse-update-site/0eb404d0c65dc0ef25b19145bb44a56326a53da6/updatesites/${version}/plugins/org.testng.eclipse_${version}.jar"; hash = "sha256-DTE60G+1ZnBT0i6FHuYDQlzwxhwAeXbHN3hgkYbhn8g="; }; Loading
pkgs/applications/emulators/mame/default.nix +1 −1 Original line number Diff line number Diff line Loading @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { installPhase = let icon = fetchurl { url = "https://raw.githubusercontent.com/PapirusDevelopmentTeam/papirus-icon-theme/refs/heads/master/Papirus/32x32/apps/mame.svg"; url = "https://raw.githubusercontent.com/PapirusDevelopmentTeam/papirus-icon-theme/4256be4cf56870aa1fbd85c48cafeafa187160e0/Papirus/32x32/apps/mame.svg"; hash = "sha256-s44Xl9UGizmddd/ugwABovM8w35P0lW9ByB69MIpG+E="; }; in Loading
pkgs/by-name/bo/boxflat/package.nix +1 −0 Original line number Diff line number Diff line Loading @@ -49,6 +49,7 @@ python3Packages.buildPythonPackage rec { "psutil" "evdev" "pycairo" "pygobject" "PyYAML" ]; Loading
pkgs/by-name/el/ela-widget-tools/fix-install-path.patch 0 → 100644 +90 −0 Original line number Diff line number Diff line diff --git a/CMakeLists.txt b/CMakeLists.txt index d04794e..b686747 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,11 +10,6 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>") -#在这里配置QT路径 例如 D:/Qt/6.6.2/msvc2019_64 D:/Qt/5.15.2/msvc2019_64 /home/liniyous/Qt/5.15.2/gcc_64 -SET(QT_SDK_DIR D:/Qt/5.15.2/msvc2019_64 CACHE PATH "QT SDK DIR" FORCE) -message("在CMAKE中配置 QT_SDK_DIR 选项指定QT路径; 当前路径: ${QT_SDK_DIR}") -SET(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/Install CACHE PATH "Installation path" FORCE) - option(BUILD_ELAPACKETIO "Build ElaPacketIO" OFF) list(APPEND CMAKE_PREFIX_PATH ${QT_SDK_DIR}) diff --git a/ElaWidgetTools/CMakeLists.txt b/ElaWidgetTools/CMakeLists.txt index 0f61edd..7b075f1 100644 --- a/ElaWidgetTools/CMakeLists.txt +++ b/ElaWidgetTools/CMakeLists.txt @@ -46,9 +46,9 @@ if (MSVC) set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX "d") endif () -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Widgets ) @@ -63,13 +63,6 @@ endif () install( TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME} - ARCHIVE DESTINATION ${PROJECT_NAME}/lib - LIBRARY DESTINATION ${PROJECT_NAME}/lib - RUNTIME DESTINATION ${PROJECT_NAME}/bin -) -install(TARGETS ${PROJECT_NAME} - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/ElaWidgetToolsExample - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/ElaWidgetToolsExample ) if (MSVC AND NOT LIB_TYPE STREQUAL "STATIC") install( @@ -87,7 +80,7 @@ set(LIB_DIR lib) install( EXPORT ${PROJECT_NAME} FILE ${PROJECT_NAME}Targets.cmake - DESTINATION ${PROJECT_NAME}/lib/cmake + DESTINATION lib/cmake ) include(CMakePackageConfigHelpers) @@ -102,7 +95,6 @@ configure_package_config_file( ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION lib/cmake PATH_VARS INCLUDE_DIRS LIBRARIES LIB_DIR - INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME} ) install( diff --git a/ElaWidgetToolsExample/CMakeLists.txt b/ElaWidgetToolsExample/CMakeLists.txt index 7330ed1..3cd0cc7 100644 --- a/ElaWidgetToolsExample/CMakeLists.txt +++ b/ElaWidgetToolsExample/CMakeLists.txt @@ -41,9 +41,9 @@ else () ) endif () -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) if (WIN32) target_include_directories(${PROJECT_NAME} PUBLIC @@ -93,8 +93,6 @@ endif () include(GNUInstallDirs) install(TARGETS ${PROJECT_NAME} - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME} - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME} ) if (MSVC) install(
pkgs/by-name/el/ela-widget-tools/package.nix 0 → 100644 +66 −0 Original line number Diff line number Diff line { fetchFromGitHub, lib, stdenv, cmake, qt6, ... }: stdenv.mkDerivation (finalAttrs: { pname = "ela-widget-tools"; version = "0-unstable-2025-10-30"; src = fetchFromGitHub { owner = "Liniyous"; repo = "ElaWidgetTools"; rev = "c1eed7c23545e61cc63a34f2cc26737c9d563f78"; hash = "sha256-bmByAQKasqJIaX9W8M+cFQppr7ACF07TZAuXb0xgvfU="; }; patches = [ ./fix-install-path.patch ]; # Qt CMake private include path is empty, generate one ourselves postPatch = let includeBaseFor = component: [ "${qt6.qtbase}/include/${component}/${qt6.qtbase.version}" "${qt6.qtbase}/include/${component}/${qt6.qtbase.version}/${component}" ]; includePaths = builtins.concatStringsSep " " ( lib.flatten ( builtins.map includeBaseFor [ "QtCore" "QtGui" "QtWidgets" ] ) ); in '' substituteInPlace ElaWidgetTools/CMakeLists.txt \ --replace-fail \ '${"\${Qt\${QT_VERSION_MAJOR}Widgets_PRIVATE_INCLUDE_DIRS}"}' \ "${includePaths}" ''; nativeBuildInputs = [ cmake qt6.wrapQtAppsHook ]; buildInputs = [ qt6.qtbase ]; postInstall = '' cp -r $out/ElaWidgetTools/* $out/ rm -rf $out/ElaWidgetTools ''; meta = { mainProgram = "ElaWidgetToolsExample"; maintainers = with lib.maintainers; [ xddxdd ]; description = "Fluent-UI For QT-Widget"; homepage = "https://github.com/Liniyous/ElaWidgetTools"; license = lib.licenses.mit; }; })
![nixpkgs-ci[bot]'s avatar](https://secure.gravatar.com/avatar/21d9e4256a026824783d9069d7622ceb22d44398fd318ddfee596c72e5556369?s=48&d=identicon "nixpkgs-ci[bot]")