Skip to content

Commit 9e5ff13

Browse files
committed
fixup: Pin Qtcreator also
QtCreator was still against nixpkgs not the specific qt variant.
1 parent 4e2c27b commit 9e5ff13

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

flake.lock

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

flake.nix

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
inputs = {
33
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
44

5-
qt6Pkgs = {
5+
qt6Nixpkgs = {
66
# Commit bumping to qt6.6.3
77
url = "github:NixOS/nixpkgs/f862bd46d3020bcfe7195b3dad638329271b0524";
88
};
99
};
1010

11-
outputs = { self, nixpkgs, qt6Pkgs }:
11+
outputs = { self, nixpkgs, qt6Nixpkgs }:
1212
let
1313
pkgs = nixpkgs.legacyPackages.x86_64-linux;
1414

15-
qt6 = qt6Pkgs.legacyPackages.x86_64-linux.qt6;
15+
qt6Pkgs = qt6Nixpkgs.legacyPackages.x86_64-linux;
1616
in {
1717
devShells.x86_64-linux.default = pkgs.mkShell {
1818
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [
@@ -31,9 +31,9 @@
3131
pkgs.libpulseaudio
3232
pkgs.libkrb5
3333

34-
qt6.qtwayland
35-
qt6.full
36-
qt6.qtbase
34+
qt6Pkgs.qt6.qtwayland
35+
qt6Pkgs.qt6.full
36+
qt6Pkgs.qt6.qtbase
3737
];
3838
buildInputs = with pkgs; [
3939
cmake
@@ -62,13 +62,13 @@
6262
makeWrapper
6363
bashInteractive
6464
] ++ [
65-
qt6.qtbase
66-
qt6.full
67-
qt6.qtwayland
68-
qtcreator
65+
qt6Pkgs.qt6.qtbase
66+
qt6Pkgs.qt6.full
67+
qt6Pkgs.qt6.qtwayland
68+
qt6Pkgs.qtcreator
6969

7070
# this is for the shellhook portion
71-
qt6.wrapQtAppsHook
71+
qt6Pkgs.qt6.wrapQtAppsHook
7272
];
7373
# set the environment variables that Qt apps expect
7474
shellHook = ''

0 commit comments

Comments
 (0)