diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix b/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix index b86ae37363ee..ff16debee7ef 100644 --- a/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix +++ b/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix @@ -4,6 +4,8 @@ , copyDesktopItems , makeDesktopItem , makeWrapper +, wrapGAppsHook +, gvfs , maven , jre }: @@ -18,13 +20,13 @@ let in maven.buildMavenPackage rec { pname = "ns-usbloader"; - version = "7.0"; + version = "7.1"; src = fetchFromGitHub { owner = "developersu"; repo = "ns-usbloader"; rev = "v${version}"; - sha256 = "sha256-x4zGwsDUVUHI4AUMPSqgnZVyZx+pWQA5xvtrFE8U3QU="; + sha256 = "sha256-gSf5SCIhcUEYGsYssXVGjUweVU+guxOI+lzD3ANr96w="; }; patches = [ ./no-launch4j.patch ./make-deterministic.patch ]; @@ -40,18 +42,25 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ copyDesktopItems makeWrapper + wrapGAppsHook + gvfs ]; + # Don't wrap binaries twice. + dontWrapGApps = true; + + ### Issues: + # * Set us to only use software rendering with `-Dprism.order=sw`, had a hard time + # getting `prism_es2` happy with NixOS's GL/GLES. + # * Currently, there's also a lot of `Failed to build parent project for org.openjfx:javafx-*` + # at build, but jar runs fine when using `jreWithJavaFX`. + installPhase = '' runHook preInstall mkdir -p $out/share/java install -Dm644 target/ns-usbloader-${version}.jar $out/share/java/ns-usbloader.jar - mkdir -p $out/bin - makeWrapper ${jreWithJavaFX}/bin/java $out/bin/ns-usbloader \ - --append-flags "-jar $out/share/java/ns-usbloader.jar" - mkdir -p $out/lib/udev/rules.d install -Dm644 ${./99-ns-usbloader.rules} $out/lib/udev/rules.d/99-ns-usbloader.rules @@ -64,6 +73,13 @@ maven.buildMavenPackage rec { runHook postInstall ''; + preFixup = '' + mkdir -p $out/bin + makeWrapper ${jreWithJavaFX}/bin/java $out/bin/ns-usbloader \ + --append-flags "-Dprism.order=sw -jar $out/share/java/ns-usbloader.jar" \ + "''${gappsWrapperArgs[@]}" + ''; + desktopItems = [ (makeDesktopItem { type = "Application"; |