Merge pull request #129306 from fabaff/bump-unetbootin
unetbootin: 681 -> 702
This commit is contained in:
commit
18dc02c296
1 changed files with 33 additions and 16 deletions
|
@ -1,23 +1,39 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, qt4, util-linux, coreutils, which, qmake4Hook
|
||||
, p7zip, mtools, syslinux }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, coreutils
|
||||
, fetchFromGitHub
|
||||
, libsForQt5
|
||||
, mtools
|
||||
, p7zip
|
||||
, qt5
|
||||
, syslinux
|
||||
, util-linux
|
||||
, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unetbootin";
|
||||
version = "681";
|
||||
version = "702";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unetbootin";
|
||||
repo = "unetbootin";
|
||||
rev = version;
|
||||
sha256 = "0ppqb7ywh4cpcjr5nw6f65dx4s8kx09gnhihnby3zjhxdf4l99fm";
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-psX15XicPXAsd36BhuvK0G3GQS8hV/hazzO0HByCqV4=";
|
||||
};
|
||||
|
||||
setSourceRoot = ''
|
||||
sourceRoot=$(echo */src/unetbootin)
|
||||
'';
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
nativeBuildInputs = [ makeWrapper qmake4Hook ];
|
||||
buildInputs = [
|
||||
qt5.qtbase
|
||||
qt5.qttools
|
||||
libsForQt5.qmake
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Lots of nice hard-coded paths...
|
||||
|
@ -50,18 +66,19 @@ stdenv.mkDerivation rec {
|
|||
install -Dm644 -t $out/share/unetbootin unetbootin_*.qm
|
||||
install -Dm644 -t $out/share/applications unetbootin.desktop
|
||||
|
||||
wrapProgram $out/bin/unetbootin \
|
||||
--prefix PATH : ${lib.makeBinPath [ mtools p7zip which ]} \
|
||||
--set QT_X11_NO_MITSHM 1
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix PATH : ${lib.makeBinPath [ mtools p7zip which ]}"
|
||||
"--set QT_X11_NO_MITSHM 1"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://unetbootin.sourceforge.net/";
|
||||
description = "A tool to create bootable live USB drives from ISO images";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
homepage = "http://unetbootin.github.io/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ebzzry ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue