File tree Expand file tree Collapse file tree 2 files changed +11
-7
lines changed Expand file tree Collapse file tree 2 files changed +11
-7
lines changed Original file line number Diff line number Diff line change 44 fetchFromGitHub ,
55 uget ,
66 python3Packages ,
7+ installShellFiles ,
78} :
89
910stdenv . mkDerivation rec {
@@ -17,7 +18,10 @@ stdenv.mkDerivation rec {
1718 sha256 = "0bfqwbpprxp5sy49p2hqcjdfj7zamnp2hhcnnyccffkn7pghx8pp" ;
1819 } ;
1920
20- nativeBuildInputs = [ python3Packages . wrapPython ] ;
21+ nativeBuildInputs = [
22+ installShellFiles
23+ python3Packages . wrapPython
24+ ] ;
2125
2226 buildInputs = [
2327 uget
@@ -29,7 +33,7 @@ stdenv.mkDerivation rec {
2933 substituteInPlace $f --replace "/usr" "$out"
3034 done
3135
32- install -D -t $out/bin bin/uget-integrator
36+ installBin bin/uget-integrator
3337 install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json
3438 install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json
3539 install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json
Original file line number Diff line number Diff line change 1212 gtk3 ,
1313 dconf ,
1414 wrapGAppsHook3 ,
15- aria2 ? null ,
15+ aria2 ,
16+ # Boolean guards
17+ aria2Support ? true ,
1618} :
1719
1820stdenv . mkDerivation rec {
@@ -51,13 +53,11 @@ stdenv.mkDerivation rec {
5153 gst-plugins-base
5254 gst-plugins-good
5355 ] )
54- ++ ( lib . optional ( aria2 != null ) aria2 ) ;
56+ ++ ( lib . optional aria2Support aria2 ) ;
5557
5658 enableParallelBuilding = true ;
5759
58- preFixup = lib . optionalString (
59- aria2 != null
60- ) ''gappsWrapperArgs+=(--suffix PATH : "${ aria2 } /bin")'' ;
60+ preFixup = lib . optionalString aria2Support ''gappsWrapperArgs+=(--suffix PATH : "${ aria2 } /bin")'' ;
6161
6262 meta = with lib ; {
6363 description = "Download manager using GTK and libcurl" ;
You can’t perform that action at this time.
0 commit comments