diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 20:52:30 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-20 07:56:51 -0600 |
commit | 660736def8734a2d2e66a03ad4f777148bc0820b (patch) | |
tree | bd2ddb0c0c0ca9a74120e1b338aae8883bb848ee /pkgs | |
parent | e78202671990320515ffca82c89d2aa079baea9b (diff) | |
download | nixpkgs-660736def8734a2d2e66a03ad4f777148bc0820b.tar nixpkgs-660736def8734a2d2e66a03ad4f777148bc0820b.tar.gz nixpkgs-660736def8734a2d2e66a03ad4f777148bc0820b.tar.bz2 nixpkgs-660736def8734a2d2e66a03ad4f777148bc0820b.tar.lz nixpkgs-660736def8734a2d2e66a03ad4f777148bc0820b.tar.xz nixpkgs-660736def8734a2d2e66a03ad4f777148bc0820b.tar.zst nixpkgs-660736def8734a2d2e66a03ad4f777148bc0820b.zip |
polkit-qt: normalize package name to upstream
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/plasma-5.5/polkit-kde-agent.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/calamares/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/desktops/plasma-5.5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5.5/polkit-kde-agent.nix index 0173ec65516..3fc3a441ac3 100644 --- a/pkgs/desktops/plasma-5.5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5.5/polkit-kde-agent.nix @@ -9,7 +9,7 @@ , kconfig , kiconthemes , knotifications -, polkitQt +, polkit-qt }: plasmaPackage { @@ -25,7 +25,7 @@ plasmaPackage { kconfig kiconthemes knotifications - polkitQt + polkit-qt ]; propagatedBuildInputs = [ ki18n kwindowsystem ]; } diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix index 42a10019334..2b000ff3c04 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix @@ -1,13 +1,13 @@ { kdeFramework, lib , extra-cmake-modules , kcoreaddons -, polkitQt +, polkit-qt }: kdeFramework { name = "kauth"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ polkitQt ]; + buildInputs = [ polkit-qt ]; propagatedBuildInputs = [ kcoreaddons ]; patches = [ ./kauth-policy-install.patch ]; meta = { diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 6ca007229bc..ab00d52c777 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, polkitQt, libyamlcpp, python, boost, parted +{ stdenv, fetchgit, cmake, polkit-qt, libyamlcpp, python, boost, parted , extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart , ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtquick1, qtsvg, qttools }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake qtbase qtquick1 qtsvg qttools libyamlcpp python boost polkitQt parted + cmake qtbase qtquick1 qtsvg qttools libyamlcpp python boost polkit-qt parted extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; preInstall = '' - substituteInPlace cmake_install.cmake --replace "${polkitQt}" "$out" + substituteInPlace cmake_install.cmake --replace "${polkit-qt}" "$out" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbe6fc553c2..a8b80d7f4ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8167,7 +8167,7 @@ let phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; - polkitQt = callPackage ../development/libraries/polkit-qt-1 { + polkit-qt = callPackage ../development/libraries/polkit-qt-1 { withQt5 = true; }; |