pyrox.dev
lol
Merge pull request #272882 from soupglasses/ns-usbloader/fix-file-picker
ns-usbloader: fix dependencies for gtk file picker
authored by
Peder Bergebakken Sundt
and committed by
GitHub
6d5be2aa
432b9bd6
+20
-4
+20
-4
pkgs/applications/misc/ns-usbloader/default.nix
+20
-4
pkgs/applications/misc/ns-usbloader/default.nix
···
4
4
, copyDesktopItems
5
5
, makeDesktopItem
6
6
, makeWrapper
7
+
, wrapGAppsHook
8
+
, gvfs
7
9
, maven
8
10
, jre
9
11
}:
···
40
42
nativeBuildInputs = [
41
43
copyDesktopItems
42
44
makeWrapper
45
+
wrapGAppsHook
46
+
gvfs
43
47
];
44
48
49
+
# Don't wrap binaries twice.
50
+
dontWrapGApps = true;
51
+
52
+
### Issues:
53
+
# * Set us to only use software rendering with `-Dprism.order=sw`, had a hard time
54
+
# getting `prism_es2` happy with NixOS's GL/GLES.
55
+
# * Currently, there's also a lot of `Failed to build parent project for org.openjfx:javafx-*`
56
+
# at build, but jar runs fine when using `jreWithJavaFX`.
57
+
45
58
installPhase = ''
46
59
runHook preInstall
47
60
48
61
mkdir -p $out/share/java
49
62
install -Dm644 target/ns-usbloader-${version}.jar $out/share/java/ns-usbloader.jar
50
-
51
-
mkdir -p $out/bin
52
-
makeWrapper ${jreWithJavaFX}/bin/java $out/bin/ns-usbloader \
53
-
--append-flags "-jar $out/share/java/ns-usbloader.jar"
54
63
55
64
mkdir -p $out/lib/udev/rules.d
56
65
install -Dm644 ${./99-ns-usbloader.rules} $out/lib/udev/rules.d/99-ns-usbloader.rules
···
62
71
install -Dm644 target/classes/res/app_icon128x128.png $out/share/icons/hicolor/128x128/apps/ns-usbloader.png
63
72
64
73
runHook postInstall
74
+
'';
75
+
76
+
preFixup = ''
77
+
mkdir -p $out/bin
78
+
makeWrapper ${jreWithJavaFX}/bin/java $out/bin/ns-usbloader \
79
+
--append-flags "-Dprism.order=sw -jar $out/share/java/ns-usbloader.jar" \
80
+
"''${gappsWrapperArgs[@]}"
65
81
'';
66
82
67
83
desktopItems = [