Unverified Commit 27b75be2 authored by K900's avatar K900 Committed by GitHub
Browse files

kdePackages: Frameworks 6.23 -> 6.24 (#499779)

parents 30cd3eab 7396e74e

pkgs/by-name/ea/easyeffects/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-Tz14pjI5pNJOQH0KFaf9mJkFdup1GVxlkMnzVQusx/M=";

  };



  patches = [ ./qmlmodule-fix.patch ];



  nativeBuildInputs = [

    cmake

    extra-cmake-modules

pkgs/by-name/ea/easyeffects/qmlmodule-fix.patch

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 2736ac18b..85be09a90 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -65,7 +65,7 @@ find_package(KF${QT_MAJOR_VERSION} REQUIRED COMPONENTS

     QQC2DesktopStyle

 )

 

-ecm_find_qmlmodule(org.kde.kirigami REQUIRED)

+ecm_find_qmlmodule(org.kde.kirigami)

 

 qt_policy(SET QTP0001 NEW)

pkgs/by-name/ko/kontainer/package.nix

+0 −5
Original line number Diff line number Diff line
@@ -22,11 +22,6 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-15H4fTZ4Tja+nt0iKtFuULj/4g/0UK+W79R4kH7BFcs=";

  };



  postPatch = ''

    substituteInPlace CMakeLists.txt \

      --replace-fail "ecm_find_qmlmodule(org.kde.kirigami REQUIRED)" "ecm_find_qmlmodule(org.kde.kirigami)"

  '';



  nativeBuildInputs = [

    cmake

    ninja

pkgs/kde/frameworks/extra-cmake-modules/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ mkKdeDerivation { 


  outputs = [ "out" ];



  patches = [

    ./search-qml.patch

  ];



  # Packages that have an Android APK (e.g. KWeather) require Python3 at build time.

  # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57

  propagatedNativeBuildInputs = [

pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
ecmEnvHook() {

    addToSearchPath XDG_DATA_DIRS "$1/share"

    addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"

    if [ -n "${qtQmlPrefix-}" ]; then

      addToSearchPath NIXPKGS_QML_SEARCH_PATHS "$1/$qtQmlPrefix"

    fi

}

addEnvHooks "$hostOffset" ecmEnvHook