diff --git a/build.nix b/build.nix index b38b225..6cd7b63 100644 --- a/build.nix +++ b/build.nix @@ -4,6 +4,7 @@ let release = import ./release.nix; + darwinString = pkgs.lib.optionalString pkgs.stdenv.isDarwin; in pkgs.stdenv.mkDerivation rec { @@ -13,6 +14,7 @@ pkgs.stdenv.mkDerivation rec { then pkgs.fetchzip { url = release.${"${attrName}-darwin"}.url; sha256 = release.${"${attrName}-darwin"}.hash; + stripRoot = false; } else pkgs.fetchzip { url = release.${"${attrName}-linux"}.url; @@ -23,7 +25,10 @@ pkgs.stdenv.mkDerivation rec { passthru.binNames = binNames; - installPhase = '' + installPhase = darwinString '' + find . -type f -exec mv -t . {} + || true + find . -empty -type d -delete + '' + '' mkdir -p $out/bin ${pkgs.lib.concatMapStringsSep "\n" (binName: '' @@ -40,8 +45,12 @@ pkgs.stdenv.mkDerivation rec { "$binPath" --fish-completion-script "$binPath" > "${binName}.fish" installShellCompletion --fish "${binName}.fish" rm "${binName}.fish" + '' + darwinString '' + if test -f "${binName}.1"; then + installManPage ${binName}.1 + rm ${binName}.1 + fi '') binNames} - # check that we didn’t forget any files (maybe a new binary was added) if [ ! -z "$(${pkgs.lr}/bin/lr -1 -t 'depth == 1' .)" ]; then echo "still some files remaining!" >&2 diff --git a/release.json b/release.json index 63d61a1..78282bb 100644 --- a/release.json +++ b/release.json @@ -37,7 +37,7 @@ "dhall-json-darwin": { "name": "dhall-json-1.7.3-x86_64-macos.tar.bz2", "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.36.0/dhall-json-1.7.3-x86_64-macos.tar.bz2", - "hash": "0ms569z3a4jnnmqw8j6jgj1dwsa42jz39gbfx6aqvywmdh1dgrsg" + "hash": "sha256-JX/9SpE/6KBNx/z2DINJonWqjpS/m8GnpBHXxUvIti8" }, "dhall-lsp-server-linux": { "name": "dhall-lsp-server-1.0.11-x86_64-linux.tar.bz2", @@ -47,7 +47,7 @@ "dhall-lsp-server-darwin": { "name": "dhall-lsp-server-1.0.11-x86_64-macos.tar.bz2", "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.36.0/dhall-lsp-server-1.0.11-x86_64-macos.tar.bz2", - "hash": "1zhbay382wskwf1jflvh7k73ip9gnk7v84b6x9fmvclmp0nqjjvp" + "hash": "sha256-QllqI728IT3bHiVWTr/rACwexWJS4gNYjjKS9nALF+o=" }, "dhall-nix-linux": { "name": "dhall-nix-1.1.18-x86_64-linux.tar.bz2", @@ -72,6 +72,6 @@ "dhall-yaml-darwin": { "name": "dhall-yaml-1.2.3-x86_64-macos.tar.bz2", "url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.36.0/dhall-yaml-1.2.3-x86_64-macos.tar.bz2", - "hash": "1hxqbhrznzd043xp1sys8dg6s4y0vss345023869n1vn3czzxn1f" + "hash": "sha256-7+6/GgQqUAmNY+eCRKUAnZMQ0sUPozKVmXUSplVIxKw=" } -} \ No newline at end of file +}