Skip to content

Commit 0fca6dc

Browse files
committed
flake: use upstream qt6
1 parent 5c732a5 commit 0fca6dc

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

flake.lock

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
url = "github:itay-grudev/SingleApplication/0d7b2630bda26f7dd4752c90faa9719455cab433";
1313
flake = false;
1414
};
15-
nixpkgs.url = "github:NixOS/nixpkgs?ref=pull/141883/head";
15+
nixpkgs.url = "github:NixOS/nixpkgs";
1616
flake-utils.url = "github:numtide/flake-utils";
1717
};
1818
outputs = inputs@{ self, nixpkgs, flake-utils, ... }:
@@ -27,13 +27,13 @@
2727
}
2828
) // {
2929
overlay = final: prev: {
30-
across = final.qt6.mkDerivation {
30+
across = final.stdenv.mkDerivation {
3131
name = "across";
3232
src = self;
33-
inherit (final.qt6.qtbase) qtDocPrefix qtQmlPrefix qtPluginPrefix;
3433
cmakeFlags = [ "-DFETCH_SINGLE_APPLICATION=OFF" ];
3534
nativeBuildInputs = with final; [
3635
cmake
36+
ninja
3737
pkg-config
3838
qt6.wrapQtAppsHook
3939
];
@@ -48,20 +48,15 @@
4848
nlohmann_json
4949
magic_enum
5050
semver
51-
qt6.qtwayland
51+
qt6.qtbase
5252
qt6.qt5compat
53-
qt6.qttools
5453
qt6.qttranslations
5554
qt6.qtsvg
5655
];
5756
postPatch = ''
5857
rm -fr 3rdpart/*
5958
ln -s ${inputs.single_application} 3rdpart/SingleApplication
6059
'';
61-
dontWrapQtApps = true;
62-
preFixup = with final.qt6;''
63-
wrapQtApp "$out/bin/across" --prefix QML2_IMPORT_PATH : "${qtdeclarative}/qml:${qt5compat}/qml:${qtimageformats}/qml"
64-
'';
6560
};
6661
magic_enum = final.stdenv.mkDerivation {
6762
name = "magic_enum";

0 commit comments

Comments
 (0)