getting closer to a working nix environment

This commit is contained in:
Chris Cochrun 2022-05-24 10:03:47 -05:00
parent b45763a62c
commit 24993f99f1
2 changed files with 53 additions and 3 deletions

41
flake.lock generated Normal file
View 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
}

View file

@ -1,5 +1,6 @@
with import <nixpkgs> { };
pkgs.mkShell {
{ pkgs ? <nixpkgs> { } }:
with pkgs;
mkShell {
name = "presenter-env";
nativeBuildInputs = [
@ -9,6 +10,7 @@ pkgs.mkShell {
cmake
extra-cmake-modules
pkg-config
libsForQt5.wrapQtAppsHook
# gccStdenv
# stdenv
];
@ -27,7 +29,14 @@ pkgs.mkShell {
# ffmpeg-full
# yt-dlp
];
# This creates the proper qt env so that plugins are found right.
shellHook = ''
setQtEnvironment=$(mktemp --suffix .setQtEnvironment.sh)
echo "shellHook: setQtEnvironment = $setQtEnvironment"
makeWrapper "/bin/sh" "$setQtEnvironment" "''${qtWrapperArgs[@]}"
sed "/^exec/d" -i "$setQtEnvironment"
source "$setQtEnvironment"
fish
'';
}