mirror of
https://github.com/fjvallarino/monomer.git
synced 2024-08-16 15:30:27 +03:00
Fix flake.nix definition to work with more recent nixpkgs snapshots (#266)
* Rework flake.nix * Add devShell environment on flake.nix * Update flake.lock
This commit is contained in:
parent
ff2ea3b414
commit
7036f7aac8
@ -18,11 +18,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1629366148,
|
||||
"narHash": "sha256-CIfmrcptxXiCVH9UCKRq44IHcSW8WQ8yQQPTavOpUF8=",
|
||||
"lastModified": 1682554371,
|
||||
"narHash": "sha256-UYm0a60XOmBDBQqgySDRN8LUV5xWZn26OzjTCeVrYDs=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b5c2212cdfceb727b072223e460eb7dcefbc4062",
|
||||
"rev": "dc9fe27b825a4196fe81a583eb3a174da847660e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -29,5 +29,13 @@
|
||||
};
|
||||
defaultPackage = packages.monomer;
|
||||
defaultApp = apps.tutorial;
|
||||
devShell = haskellPackages.shellFor {
|
||||
packages = p: [ packages.monomer ];
|
||||
withHoogle = true;
|
||||
buildInputs = with haskellPackages; [
|
||||
haskell-language-server
|
||||
cabal-install
|
||||
];
|
||||
};
|
||||
});
|
||||
}
|
||||
|
@ -16,7 +16,7 @@ with super.haskellPackages.extend (self: super:
|
||||
rev = "283516a337c4d3606555728df0a39294e78a7cdf";
|
||||
sha256 = "1vggli76ijqmx633yix4yg5dv58a14p8561jnprjc061sjngphzv";
|
||||
}) "-fexamples -fstb_truetype" {
|
||||
inherit GLEW glew libGL libGLU;
|
||||
inherit glew libGL libGLU;
|
||||
inherit (xorg) libX11;
|
||||
});
|
||||
GLEW = glew;
|
||||
|
16
nix/qemu.nix
16
nix/qemu.nix
@ -92,14 +92,14 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
virtualisation = {
|
||||
graphics = true;
|
||||
cores = 4;
|
||||
qemu.networkingOptions = [
|
||||
"-device virtio-net-pci,netdev=user.0"
|
||||
"-netdev type=user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
|
||||
];
|
||||
};
|
||||
# virtualisation = {
|
||||
# graphics = true;
|
||||
# cores = 4;
|
||||
# qemu.networkingOptions = [
|
||||
# "-device virtio-net-pci,netdev=user.0"
|
||||
# "-netdev type=user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
|
||||
# ];
|
||||
# };
|
||||
};
|
||||
}).vm;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user