diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2021-09-26 23:06:38 +0200 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2021-10-18 23:46:17 +0200 |
| commit | eca667180beb2473ec85895a8679df7ffff9e7c8 (patch) | |
| tree | 65a648c32f5915ce745cd228a507978711cc3c60 /pkgs/tools/X11 | |
| parent | eee29df430927d2618f397acd8d02b11d04a92b0 (diff) | |
| download | nixpkgs-eca667180beb2473ec85895a8679df7ffff9e7c8.tar nixpkgs-eca667180beb2473ec85895a8679df7ffff9e7c8.tar.gz nixpkgs-eca667180beb2473ec85895a8679df7ffff9e7c8.tar.bz2 nixpkgs-eca667180beb2473ec85895a8679df7ffff9e7c8.tar.lz nixpkgs-eca667180beb2473ec85895a8679df7ffff9e7c8.tar.xz nixpkgs-eca667180beb2473ec85895a8679df7ffff9e7c8.tar.zst nixpkgs-eca667180beb2473ec85895a8679df7ffff9e7c8.zip | |
dotnet: cleanup; point dotnet-sdk alias to 5_0; remove unsupported SDKs
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/opentabletdriver/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 5bffa107764..b205f959ee3 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -3,8 +3,7 @@ , fetchFromGitHub , fetchurl , linkFarmFromDrvs -, dotnet-netcore -, dotnet-sdk +, dotnetCorePackages , dotnetPackages , dpkg , gtk3 @@ -21,6 +20,10 @@ , wrapGAppsHook }: +let + dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-runtime = dotnetCorePackages.runtime_5_0; +in stdenv.mkDerivation rec { pname = "OpenTabletDriver"; version = "0.5.3.3"; @@ -114,19 +117,19 @@ stdenv.mkDerivation rec { makeWrapper $out/lib/OpenTabletDriver.Console $out/bin/otd \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set DOTNET_ROOT "${dotnet-netcore}" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" makeWrapper $out/lib/OpenTabletDriver.Daemon $out/bin/otd-daemon \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set DOTNET_ROOT "${dotnet-netcore}" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" makeWrapper $out/lib/OpenTabletDriver.UX.Gtk $out/bin/otd-gui \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set DOTNET_ROOT "${dotnet-netcore}" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" mkdir -p $out/lib/OpenTabletDriver |