From 72237b2f2eecd3b27dee08d83ab04d9bdc3e515c Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Tue, 2 May 2023 18:15:10 -0400 Subject: [PATCH] Move the cyberpunk build script into the cyberpunk directory --- cyberpunk-splash/default.nix | 36 ++++++++++++++++++++++++++++++++++++ flake.nix | 7 +++---- 2 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 cyberpunk-splash/default.nix diff --git a/cyberpunk-splash/default.nix b/cyberpunk-splash/default.nix new file mode 100644 index 0000000..bd98c06 --- /dev/null +++ b/cyberpunk-splash/default.nix @@ -0,0 +1,36 @@ +{ pkgs, typeshare }: +let + standardOverride = attrs: { + nativeBuildInputs = [ + pkgs.pkg-config + pkgs.gtk4 + ]; + buildInputs = [ + typeshare + ]; + verbose = true; + }; + customBuildInfo = pkgs: pkgs.buildRustCrate.override { + defaultCrateOverrides = pkgs.defaultCrateOverrides // { + cairo-sys-rs = standardOverride; + graphene-sys = standardOverride; + gobject-sys = standardOverride; + pango-sys = standardOverride; + gio-sys = standardOverride; + gdk-pixbuf-sys = standardOverride; + gdk4-sys = standardOverride; + gsk4-sys = standardOverride; + gtk4-sys = standardOverride; + kifu-gtk = attrs: { + nativeBuildInputs = [ + pkgs.glib + typeshare + ]; + }; + }; + }; +in (import ./Cargo.nix { + inherit pkgs; + buildRustCrateForPkgs = customBuildInfo; + release = true; +}).rootCrate.build diff --git a/flake.nix b/flake.nix index 7e05500..75aca09 100644 --- a/flake.nix +++ b/flake.nix @@ -105,11 +105,10 @@ kifu-wasm = import ./kifu { inherit (pkgs) rustPlatform wasm-pack; mkDerivation = pkgs.stdenv.mkDerivation; typeshare = typeshare.packages."x86_64-linux".default; }; */ - cyberpunk-splash = (import ./cyberpunk-splash/Cargo.nix { + cyberpunk-splash = import ./cyberpunk-splash { inherit pkgs; - buildRustCrateForPkgs = customBuildInfo; - release = true; - }).rootCrate.build; + typeshare = typeshare.packages."x86_64-linux".default; + }; }; }; }