Unverified Commit 5f7fd26d authored by Sapphire's avatar Sapphire
Browse files

corectrl: 1.4.3 -> 1.5.1

parent b08e86e1

pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff

0 → 100644
+14 −0
Original line number Diff line number Diff line 
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt

index 38deb12..7bbaa81 100644

--- a/src/helper/CMakeLists.txt

+++ b/src/helper/CMakeLists.txt

@@ -27,8 +27,8 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1")

 option(POLKIT_POLICY_INSTALL_DIR "Polkit policy files installation directory" OFF)

 

 # Find polkit

+pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)

 if(NOT POLKIT_POLICY_INSTALL_DIR)

-  pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)

   execute_process(

     COMMAND pkg-config --variable=policydir polkit-gobject-1

     RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT

pkgs/by-name/co/corectrl/package.nix

+18 −17
Original line number Diff line number Diff line 
{

  botan3,

  extra-cmake-modules,

  fetchFromGitLab,

  cmake,

  pkg-config,

  hwdata,

  lib,

  libdrm,

  libsForQt5,

  kdePackages,

  mesa-demos,

  polkit,

  procps,
@@ -18,32 +19,32 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "corectrl";

  version = "1.4.3";

  version = "1.5.1";



  src = fetchFromGitLab {

    owner = "corectrl";

    repo = "corectrl";

    rev = "refs/tags/v${finalAttrs.version}";

    hash = "sha256-rQibIjLmSnkA8jk6GOo68JIeb4wZq0wxXpLs3zsB7GI=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-NwGrvDqImiyPc3AsL7rMwNG9na+AzZS6NvXQOc6VWHg=";

  };



  nativeBuildInputs = [

    extra-cmake-modules

    libsForQt5.wrapQtAppsHook

    cmake

    pkg-config

    kdePackages.extra-cmake-modules

    kdePackages.wrapQtAppsHook

  ];



  buildInputs = [

    botan3

    libdrm # TODO: report upstream that libdrm is not detected at configure time

    libsForQt5.karchive

    libsForQt5.kauth

    libsForQt5.qtbase

    libsForQt5.qtcharts

    libsForQt5.qtquickcontrols2

    libsForQt5.qtsvg

    libsForQt5.qttools

    libsForQt5.qtxmlpatterns

    libsForQt5.quazip

    kdePackages.karchive

    kdePackages.kauth

    kdePackages.qtbase

    kdePackages.qtcharts

    kdePackages.qtsvg

    kdePackages.qttools

    kdePackages.quazip

    mesa-demos

    polkit

    procps
@@ -54,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  patches = [

    ./polkit-dir.patch

    ./Always-locate-polkit-with-pkg-config.diff

  ];



  cmakeFlags = [

pkgs/by-name/co/corectrl/polkit-dir.patch

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

index 3fe2ace..2542ea1 100644

--- a/src/helper/CMakeLists.txt

+++ b/src/helper/CMakeLists.txt

@@ -22,15 +22,7 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1")

 

 # Find polkit

 pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)

-execute_process(

-  COMMAND pkg-config --variable=policydir polkit-gobject-1

-  RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT

-  OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR

-  OUTPUT_STRIP_TRAILING_WHITESPACE

-)

-if(NOT POLKIT_POLICY_INSTALL_DIR_RESULT EQUAL "0")

-  message(FATAL_ERROR "Failed to retrieve Polkit `policydir` variable using pkg-config")

-endif()

+option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory")

 

 list(APPEND HELPER_COMPILE_DEFINITIONS

   ELPP_THREAD_SAFE