ns-usbloader: fix dependencies for gtk file picker
This commit is contained in:
parent
9c3f0aeb54
commit
c67b995a88
1 changed files with 20 additions and 4 deletions
|
@ -4,6 +4,8 @@
|
||||||
, copyDesktopItems
|
, copyDesktopItems
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
|
, wrapGAppsHook
|
||||||
|
, gvfs
|
||||||
, maven
|
, maven
|
||||||
, jre
|
, jre
|
||||||
}:
|
}:
|
||||||
|
@ -40,18 +42,25 @@ maven.buildMavenPackage rec {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
copyDesktopItems
|
copyDesktopItems
|
||||||
makeWrapper
|
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 = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
mkdir -p $out/share/java
|
mkdir -p $out/share/java
|
||||||
install -Dm644 target/ns-usbloader-${version}.jar $out/share/java/ns-usbloader.jar
|
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
|
mkdir -p $out/lib/udev/rules.d
|
||||||
install -Dm644 ${./99-ns-usbloader.rules} $out/lib/udev/rules.d/99-ns-usbloader.rules
|
install -Dm644 ${./99-ns-usbloader.rules} $out/lib/udev/rules.d/99-ns-usbloader.rules
|
||||||
|
|
||||||
|
@ -64,6 +73,13 @@ maven.buildMavenPackage rec {
|
||||||
runHook postInstall
|
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 = [
|
desktopItems = [
|
||||||
(makeDesktopItem {
|
(makeDesktopItem {
|
||||||
type = "Application";
|
type = "Application";
|
||||||
|
|
Loading…
Reference in a new issue