diff --git a/.envrc b/.envrc old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/build.nix b/build.nix old mode 100644 new mode 100755 index 7ed00cc..b6d373c --- a/build.nix +++ b/build.nix @@ -1,15 +1,17 @@ -{ stdenv, imagemagick, envsubst, python3Full, zip, nopng ? false, ... }: +{ stdenv, imagemagick, envsubst, python3Full, zip, util-linux, nopng ? false, bg ? "none", ... }: stdenv.mkDerivation { pname = "BetaNuBranding"; - version = "1.0.0"; + version = "1.0.1"; src = ./src; - nativeBuildInputs = [ imagemagick envsubst python3Full zip ]; + nativeBuildInputs = [ imagemagick envsubst python3Full zip util-linux ]; buildPhase = '' python build.py - ${if nopng then "" else "mogrify -format png -density 2500 -background none out/*.svg" } + cd out + ${if nopng then "" else "mogrify -format png -density 2500 -background ${bg} *.svg" } + cd .. ''; installPhase = '' diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 diff --git a/deploy.nix b/deploy.nix old mode 100644 new mode 100755 diff --git a/flake.lock b/flake.lock old mode 100644 new mode 100755 diff --git a/flake.nix b/flake.nix old mode 100644 new mode 100755 index aa134e6..23d2e22 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,8 @@ packages = rec { branding = pkgs.callPackage ./build.nix { }; branding-nopng = pkgs.callPackage ./build.nix { nopng = true; }; + branding-white = pkgs.callPackage ./build.nix { bg = "white"; }; + branding-black = pkgs.callPackage ./build.nix { bg = "black"; }; deploy = pkgs.callPackage ./deploy.nix { src = branding; }; default = branding; }; diff --git a/src/_brand.yml b/src/_brand.yml old mode 100644 new mode 100755 diff --git a/src/build.py b/src/build.py old mode 100644 new mode 100755 diff --git a/src/colors/black.sh b/src/colors/black.sh old mode 100644 new mode 100755 diff --git a/src/colors/color.sh b/src/colors/color.sh old mode 100644 new mode 100755 diff --git a/src/colors/red.sh b/src/colors/red.sh old mode 100644 new mode 100755 diff --git a/src/colors/white.sh b/src/colors/white.sh old mode 100644 new mode 100755 diff --git a/src/designs/OX.sh b/src/designs/OX.sh old mode 100644 new mode 100755 diff --git a/src/designs/logo.sh b/src/designs/logo.sh old mode 100644 new mode 100755 diff --git a/src/designs/logomark.sh b/src/designs/logomark.sh old mode 100644 new mode 100755 diff --git a/src/designs/stacked.sh b/src/designs/stacked.sh old mode 100644 new mode 100755 diff --git a/src/post.sh b/src/post.sh old mode 100644 new mode 100755 diff --git a/src/style.sh b/src/style.sh old mode 100644 new mode 100755 diff --git a/src/template.svg b/src/template.svg old mode 100644 new mode 100755