git.iko.soy/obelisk
on master help sign in
Merge pull request #289 from obsidiansystems/nix-simplify
3ec4f82Luigy Leon
default.nix+1−3
compare with master
unifiedsplit
@@ -147,9 +147,7 @@ in rec {
147 processAssets = { src, packageName ? "obelisk-generated-static", moduleName ? "Obelisk.Generated.Static" }: pkgs.runCommand "asset-manifest" {
147 processAssets = { src, packageName ? "obelisk-generated-static", moduleName ? "Obelisk.Generated.Static" }: pkgs.runCommand "asset-manifest" {
148 inherit src;
148 inherit src;
149 outputs = [ "out" "haskellManifest" "symlinked" ];
149 outputs = [ "out" "haskellManifest" "symlinked" ];
150− buildInputs = [
150+ nativeBuildInputs = [ ghcObelisk.obelisk-asset-manifest ];
151− (reflex-platform.ghc.callCabal2nix "obelisk-asset-manifest" (hackGet ./lib/asset + "/manifest") {})
152− ];
153 } ''
151 } ''
154 set -euo pipefail
152 set -euo pipefail
155 touch "$out"
153 touch "$out"