diff options
| author | Ivv <41924494+IvarWithoutBones@users.noreply.github.com> | 2022-09-11 21:40:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-11 21:40:06 +0200 |
| commit | 44ef157f555e57f529326a6e96a8b9aaedd3413a (patch) | |
| tree | b1fbb758216e01bef156cdc2498e11f0abb37617 /pkgs/tools/X11 | |
| parent | 3d38c88e8fe5971b64dbf8f332897516aa058e20 (diff) | |
| parent | 259e54c4fd159ee515e93f9e7b17e4178e76848c (diff) | |
| download | nixpkgs-44ef157f555e57f529326a6e96a8b9aaedd3413a.tar nixpkgs-44ef157f555e57f529326a6e96a8b9aaedd3413a.tar.gz nixpkgs-44ef157f555e57f529326a6e96a8b9aaedd3413a.tar.bz2 nixpkgs-44ef157f555e57f529326a6e96a8b9aaedd3413a.tar.lz nixpkgs-44ef157f555e57f529326a6e96a8b9aaedd3413a.tar.xz nixpkgs-44ef157f555e57f529326a6e96a8b9aaedd3413a.tar.zst nixpkgs-44ef157f555e57f529326a6e96a8b9aaedd3413a.zip | |
Merge pull request #187359 from IvarWithoutBones/dotnetmodule-updatescripts
treewide: migrate buildDotnetModule update scripts to use fetch-deps
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/opentabletdriver/default.nix | 2 | ||||
| -rwxr-xr-x | pkgs/tools/X11/opentabletdriver/update.sh | 20 |
2 files changed, 3 insertions, 19 deletions
diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index e43e4e1947d..5f04e4b46ac 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -115,7 +115,7 @@ buildDotnetModule rec { homepage = "https://github.com/OpenTabletDriver/OpenTabletDriver"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ thiagokokada ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "otd"; }; } diff --git a/pkgs/tools/X11/opentabletdriver/update.sh b/pkgs/tools/X11/opentabletdriver/update.sh index 1524a995016..322350415e7 100755 --- a/pkgs/tools/X11/opentabletdriver/update.sh +++ b/pkgs/tools/X11/opentabletdriver/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_6 dotnet-sdk_5 +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -23,20 +23,4 @@ sed -i ./default.nix -re "s|\"$oldDebSha256\"|\"$newDebSha256\"|" pushd ../../../.. update-source-version opentabletdriver "$new_version" -store_src="$(nix-build -A opentabletdriver.src --no-out-link)" -src="$(mktemp -d /tmp/opentabletdriver-src.XXX)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" - -pushd "$src" -trap "rm -rf $src" EXIT - -export DOTNET_NOLOGO=1 -export DOTNET_CLI_TELEMETRY_OPTOUT=1 - -mkdir ./nuget_pkgs -for project in OpenTabletDriver.{Console,Daemon,UX.Gtk,Tests}; do - dotnet restore $project --packages ./nuget_pkgs -done - -nuget-to-nix ./nuget_pkgs > "$deps_file" +$(nix-build -A opentabletdriver.fetch-deps --no-out-link) "$deps_file" |