diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-04-10 20:43:08 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-04-10 20:43:08 +0200 |
| commit | 69bfdf2484041b9d242840c4e5017b4703383bb0 (patch) | |
| tree | d8bdaa69e7990d7d6f09b594b3c425f742acd2d0 /nixpkgs/pkgs/development/libraries/qt-6/modules | |
| parent | c8aee4b4363b6bf905a521b05b7476960e8286c8 (diff) | |
| parent | d8fe5e6c92d0d190646fb9f1056741a229980089 (diff) | |
| download | nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.gz nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.bz2 nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.lz nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.xz nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.zst nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.zip | |
Merge commit 'd8fe5e6c'
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qt-6/modules')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index c223a2236353..a14028e1259a 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -211,10 +211,7 @@ stdenv.mkDerivation rec { inherit patches; - # https://bugreports.qt.io/browse/QTBUG-97568 - postPatch = '' - substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${buildPackages.coreutils}/bin/ls" - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" ''; |