diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-04-13 21:12:35 +0800 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2023-04-14 19:30:00 +0800 |
| commit | 37e3fafb41b16c8060a1c45cc984d4eefeb87855 (patch) | |
| tree | e3bfb74ce2dad47c91c153d0a5e805b74ab5df2f | |
| parent | 91fb53dce30b0c886c1b9d276eadfb08b419f403 (diff) | |
| download | nixpkgs-37e3fafb41b16c8060a1c45cc984d4eefeb87855.tar nixpkgs-37e3fafb41b16c8060a1c45cc984d4eefeb87855.tar.gz nixpkgs-37e3fafb41b16c8060a1c45cc984d4eefeb87855.tar.bz2 nixpkgs-37e3fafb41b16c8060a1c45cc984d4eefeb87855.tar.lz nixpkgs-37e3fafb41b16c8060a1c45cc984d4eefeb87855.tar.xz nixpkgs-37e3fafb41b16c8060a1c45cc984d4eefeb87855.tar.zst nixpkgs-37e3fafb41b16c8060a1c45cc984d4eefeb87855.zip | |
qt6.qtdeclarative: drop outdated workarounds
| -rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtdeclarative.nix | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index 48855377f2f..e720abd3d60 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -10,21 +10,10 @@ qtModule { pname = "qtdeclarative"; qtInputs = [ qtbase qtlanguageserver qtshadertools ]; propagatedBuildInputs = [ openssl python3 ]; - preConfigure = '' - export LD_LIBRARY_PATH="$PWD/build/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - cmakeFlags = [ - "-DQT6_INSTALL_PREFIX=${placeholder "out"}" - "-DQT_INSTALL_PREFIX=${placeholder "out"}" - ]; patches = [ # prevent headaches from stale qmlcache data ../patches/qtdeclarative-default-disable-qmlcache.patch ]; - postInstall = '' - substituteInPlace "$out/lib/cmake/Qt6Qml/Qt6QmlMacros.cmake" \ - --replace ''\'''${QT6_INSTALL_PREFIX}' "$dev" - ''; devTools = [ "bin/qml" "bin/qmlcachegen" |