diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:04:31 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:04:31 +0100 |
commit | f19eb635b4585f6ba4f9f4c3e9e07f56623446f5 (patch) | |
tree | 4d64a15e34e8a2b54466ba165297a6bb08bfb280 /pkgs/tools/X11 | |
parent | 0e4e47512d709e93c35fa575dd82e3e6ce4f884d (diff) | |
parent | 2be707eca80b573c931007de78c936d49ab45395 (diff) | |
download | nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.gz nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.bz2 nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.lz nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.xz nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.zst nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.zip |
Merge branch 'master' into staging-next
https://github.com/NixOS/nixpkgs/commit/b04fc593e7b55fe1f74421b11589f12a339c92e2 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r-- | pkgs/tools/X11/opentabletdriver/default.nix | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 6f8f9e44cc4a..486cb50b7f39 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitHub , fetchurl -, makeWrapper , linkFarmFromDrvs , dotnet-netcore , dotnet-sdk @@ -15,7 +14,9 @@ , libevdev , libnotify , udev +, copyDesktopItems , makeDesktopItem +, makeWrapper , wrapGAppsHook }: @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { dotnet-sdk dotnetPackages.Nuget dpkg + copyDesktopItems makeWrapper wrapGAppsHook ]; @@ -62,6 +64,8 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure + export HOME=$(mktemp -d) export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 @@ -76,20 +80,25 @@ stdenv.mkDerivation rec { for project in OpenTabletDriver.{Console,Daemon,UX.Gtk}; do dotnet restore --source "$PWD/nixos" $project done + + runHook postConfigure ''; buildPhase = '' + runHook preBuild + for project in OpenTabletDriver.{Console,Daemon,UX.Gtk}; do dotnet build $project \ --no-restore \ --configuration Release \ --framework net5 done + + runHook postBuild ''; installPhase = '' - mkdir -p $out/lib/OpenTabletDriver/ - cp -r ./OpenTabletDriver/Configurations/ $out/lib/OpenTabletDriver/ + runHook preInstall for project in OpenTabletDriver.{Console,Daemon,UX.Gtk}; do dotnet publish $project \ @@ -119,11 +128,19 @@ stdenv.mkDerivation rec { --set DOTNET_ROOT "${dotnet-netcore}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" - mkdir -p $out/share/{applications,pixmaps} + mkdir -p $out/lib/OpenTabletDriver + cp -rv ./OpenTabletDriver/Configurations $out/lib/OpenTabletDriver + install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps - cp -r $src/OpenTabletDriver.UX/Assets/* $out/share/pixmaps + # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead + dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/30-opentabletdriver.rules + install -Dm644 ./usr/lib/udev/rules.d/30-opentabletdriver.rules -t $out/lib/udev/rules.d - cp -r ${makeDesktopItem { + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { desktopName = "OpenTabletDriver"; name = "OpenTabletDriver"; exec = "otd-gui"; @@ -131,13 +148,8 @@ stdenv.mkDerivation rec { comment = meta.description; type = "Application"; categories = "Utility;"; - }}/share/applications/* $out/share/applications - - # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead - dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/30-opentabletdriver.rules - mkdir -p $out/lib/udev/rules.d - cp ./usr/lib/udev/rules.d/* $out/lib/udev/rules.d - ''; + }) + ]; dontWrapGApps = true; dontStrip = true; |