nix successfully builds

This commit is contained in:
Jussi Kuokkanen 2021-02-25 14:33:48 +02:00
parent 2557227170
commit 44434034a7
2 changed files with 29 additions and 3 deletions

View File

@ -2,13 +2,20 @@
, stdenv , stdenv
, boost , boost
, cmake , cmake
, cudatoolkit
, git , git
, fetchFromGitHub , fetchFromGitHub
, libdrm , libdrm
, libX11
, libXext
, libXNVCtrl # this is supposed to work, but with the qt5.callPackages thing doesn't?
, meson , meson
, mkDerivation , mkDerivation
, ninja , ninja
, nvidia_x11
, pkg-config , pkg-config
, qtbase
, qtcharts
}: }:
mkDerivation rec { mkDerivation rec {
@ -19,23 +26,39 @@ mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
owner = "Lurkki14"; owner = "Lurkki14";
repo = "tuxclocker"; repo = "tuxclocker";
rev = "b0c39bfaeb1b5da20accd0d65dacfd5ac13a6225"; rev = "2557227170cb94be12008bced6b9b3cfd93b8342";
sha256 = "02jribnk9d9h1y01fbl9pafyz4vybfkma2mv73n7i707gfv6dk2r"; sha256 = "0gncf65hy11zwjf7mpz4k57ik15980mssykj2r1zd6gda48pw832";
#rev = "002c2868118b2fa7d2e8db9d8a84a6b47dd261e5";
#rev = "b0c39bfaeb1b5da20accd0d65dacfd5ac13a6225";
#sha256 = "02jribnk9d9h1y01fbl9pafyz4vybfkma2mv73n7i707gfv6dk2r";
#sha256 = "0a553i6mr9hxlfzvgidsn0ss0hbcr9jdiaknhv59bailalajn58i";
}; };
# meson 0.57 should fix having to have these # meson 0.57 should fix having to have these
BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
preConfigure = ''
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXNVCtrl}/include"
NIX_LDFLAGS="$NIX_LDFLAGS -L${libXNVCtrl}/lib"
'';
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
]; ];
buildInputs = [ buildInputs = [
boost boost
cudatoolkit
libdrm libdrm
libXext
#libX11
#libXNVCtrl
meson meson
ninja ninja
nvidia_x11
pkg-config pkg-config
qtbase
qtcharts
]; ];
} }

View File

@ -1,2 +1,5 @@
with import <nixpkgs> {}; with import <nixpkgs> {};
libsForQt5.callPackage ./default.nix {} libsForQt5.callPackage ./default.nix {
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
nvidia_x11 = linuxPackages.nvidia_x11;
}