Colin
dac245e032
```
• Updated input 'nixpkgs-unpatched':
'github:nixos/nixpkgs/df6db8c5b0b94b85e578d05b37e5bf3b24555638' (2023-04-08)
→ 'github:nixos/nixpkgs/4e2c1815ed1a40825c52e30dc993bf3a3c136104' (2023-04-11)
• Updated input 'sops-nix':
'github:Mic92/sops-nix/b93eb910f768f9788737bfed596a598557e5625d' (2023-04-02)
→ 'github:Mic92/sops-nix/00d5fd73756d424de5263b92235563bc06f2c6e1' (2023-04-11)
• Updated input 'sops-nix/nixpkgs-stable':
'github:NixOS/nixpkgs/c1e2efaca8d8a3db6a36f652765d6c6ba7bb8fae' (2023-04-01)
→ 'github:NixOS/nixpkgs/e45cc0138829ad86e7ff17a76acf2d05e781e30a' (2023-04-09)
```
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix
|
|
index e71b0a7613d..72779ac57a5 100644
|
|
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
|
|
+++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix
|
|
@@ -5,6 +5,7 @@
|
|
, version
|
|
, coreutils
|
|
, bison
|
|
+, buildPackages
|
|
, flex
|
|
, gdb
|
|
, gperf
|
|
@@ -224,6 +225,8 @@ stdenv.mkDerivation rec {
|
|
] ++ lib.optionals stdenv.isDarwin [
|
|
# error: 'path' is unavailable: introduced in macOS 10.15
|
|
"-DQT_FEATURE_cxx17_filesystem=OFF"
|
|
+ ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
|
+ "-DQT_HOST_PATH=${buildPackages.qt6.full}"
|
|
];
|
|
|
|
NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [
|
|
diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix
|
|
index 28180d3b0ca..f14c73b10ee 100644
|
|
--- a/pkgs/development/libraries/qt-6/qtModule.nix
|
|
+++ b/pkgs/development/libraries/qt-6/qtModule.nix
|
|
@@ -61,7 +61,7 @@ stdenv.mkDerivation (args // {
|
|
if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
|
|
# FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs
|
|
# I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin
|
|
- ${lib.getDev qtbase}/libexec/syncqt.pl -version "''${version%%-*}"
|
|
+ perl ${lib.getDev qtbase}/libexec/syncqt.pl -version "''${version%%-*}"
|
|
fi
|
|
'';
|
|
|