From 3106f6274d95eb8fd7e47427293bd3c99f7e8723 Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sun, 6 Nov 2022 22:22:07 -0800 Subject: [PATCH] some scaffolding --- pkgs/cxx-packages/qt/crossBuild.nix | 27 ++++++++++++++++++++ pkgs/cxx-packages/qt/hello-world/default.nix | 0 pkgs/nixos/personal/configuration.nix | 6 +++++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/cxx-packages/qt/crossBuild.nix create mode 100644 pkgs/cxx-packages/qt/hello-world/default.nix diff --git a/pkgs/cxx-packages/qt/crossBuild.nix b/pkgs/cxx-packages/qt/crossBuild.nix new file mode 100644 index 000000000..ea9bd735e --- /dev/null +++ b/pkgs/cxx-packages/qt/crossBuild.nix @@ -0,0 +1,27 @@ +{ pkgs, pkgSrc, dependencies ? [] }: +let + nixcrpkgs = import (builtins.fetchGit { + url = "git@github.com:pololu/nixcrpkgs.git"; + rev = "b18af2550b0ff1a55751c4c64cd802261b1d6b59"; + ref = "master"; + }) { nixpkgs = pkgs; }; + mkPayload = env: env.make_derivation { + builder = pkgs.writeShellScript "builder.sh" '' + source $setup + cmake-cross $src -DBUILD_SHARED_LIBS=false -DCMAKE_INSTALL_PREFIX=$out + make + make install + $host-strip $out/bin/* + if [ $os = "linux" ]; then + cp $dejavu/ttf/DejaVuSans.ttf $out/bin/ + fi + ''; + src = pkgSrc; + cross_inputs = [ env.qt ]; + native_inputs = dependencies; + dejavu = (if env.os == "linux" then env.dejavu-fonts else null); + }; +in rec { + linux-x86 = mkPayload nixcrpkgs.linux-x86; + win32 = mkPayload nixcrpkgs.win32; +} diff --git a/pkgs/cxx-packages/qt/hello-world/default.nix b/pkgs/cxx-packages/qt/hello-world/default.nix new file mode 100644 index 000000000..e69de29bb diff --git a/pkgs/nixos/personal/configuration.nix b/pkgs/nixos/personal/configuration.nix index 1b15eec51..427d2254e 100644 --- a/pkgs/nixos/personal/configuration.nix +++ b/pkgs/nixos/personal/configuration.nix @@ -177,6 +177,12 @@ in version = "0.0.17"; sha256 = "11hzjd0gxkq37689rrr2aszxng5l9fwpgs9nnglq3zhfa1msyn08"; } + { + name = "vscode-rustfmt"; + publisher = "statiolake"; + version = "0.1.2"; + sha256 = "0kprx45j63w1wr776q0cl2q3l7ra5ln8nwy9nnxhzfhillhqpipi"; + } ]; };