getting closer to a working nix environment
This commit is contained in:
parent
b45763a62c
commit
24993f99f1
2 changed files with 53 additions and 3 deletions
41
flake.lock
generated
Normal file
41
flake.lock
generated
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"flake-utils": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1652776076,
|
||||||
|
"narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1653117584,
|
||||||
|
"narHash": "sha256-5uUrHeHBIaySBTrRExcCoW8fBBYVSDjDYDU5A6iOl+k=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "f4dfed73ee886b115a99e5b85fdfbeb683290d83",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "nixpkgs",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
13
shell.nix
13
shell.nix
|
@ -1,5 +1,6 @@
|
||||||
with import <nixpkgs> { };
|
{ pkgs ? <nixpkgs> { } }:
|
||||||
pkgs.mkShell {
|
with pkgs;
|
||||||
|
mkShell {
|
||||||
name = "presenter-env";
|
name = "presenter-env";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -9,6 +10,7 @@ pkgs.mkShell {
|
||||||
cmake
|
cmake
|
||||||
extra-cmake-modules
|
extra-cmake-modules
|
||||||
pkg-config
|
pkg-config
|
||||||
|
libsForQt5.wrapQtAppsHook
|
||||||
# gccStdenv
|
# gccStdenv
|
||||||
# stdenv
|
# stdenv
|
||||||
];
|
];
|
||||||
|
@ -28,6 +30,13 @@ pkgs.mkShell {
|
||||||
# yt-dlp
|
# yt-dlp
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# This creates the proper qt env so that plugins are found right.
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
|
setQtEnvironment=$(mktemp --suffix .setQtEnvironment.sh)
|
||||||
|
echo "shellHook: setQtEnvironment = $setQtEnvironment"
|
||||||
|
makeWrapper "/bin/sh" "$setQtEnvironment" "''${qtWrapperArgs[@]}"
|
||||||
|
sed "/^exec/d" -i "$setQtEnvironment"
|
||||||
|
source "$setQtEnvironment"
|
||||||
|
fish
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue