diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 3e0eeec617b6..f790d802c0ca 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,24 +1,12 @@ { - mkDerivation, lib, stdenv, + mkDerivation, extra-cmake-modules, qtbase, qttools, shared-mime-info }: -mkDerivation ({ +mkDerivation { pname = "kcoreaddons"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools shared-mime-info ]; propagatedBuildInputs = [ qtbase ]; -} // lib.optionalAttrs (lib.versionAtLeast qtbase.version "6") { - dontWrapQtApps = true; - cmakeFlags = [ - "-DBUILD_WITH_QT6=ON" - "-DEXCLUDE_DEPRECATED_BEFORE_AND_AT=CURRENT" - ]; - postInstall = '' - moveToOutput "mkspecs" "$dev" - ''; -} // lib.optionalAttrs stdenv.isDarwin { - # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/327 - env.NIX_CFLAGS_COMPILE = "-DSOCK_CLOEXEC=0"; -}) +} |