diff options
author | Fabian Affolter <mail@fabian-affolter.ch> | 2021-07-05 10:58:40 +0200 |
---|---|---|
committer | Fabian Affolter <mail@fabian-affolter.ch> | 2021-07-05 10:58:40 +0200 |
commit | 7542395c3e9e1f1fc2c7f3e14671c6a87a0b38cb (patch) | |
tree | 346fdd97446ca4244ab71ee36ec2d7216836e29d | |
parent | b11897615150d25e07b16ab00398accbce1b77f6 (diff) | |
download | nixpkgs-7542395c3e9e1f1fc2c7f3e14671c6a87a0b38cb.tar nixpkgs-7542395c3e9e1f1fc2c7f3e14671c6a87a0b38cb.tar.gz nixpkgs-7542395c3e9e1f1fc2c7f3e14671c6a87a0b38cb.tar.bz2 nixpkgs-7542395c3e9e1f1fc2c7f3e14671c6a87a0b38cb.tar.lz nixpkgs-7542395c3e9e1f1fc2c7f3e14671c6a87a0b38cb.tar.xz nixpkgs-7542395c3e9e1f1fc2c7f3e14671c6a87a0b38cb.tar.zst nixpkgs-7542395c3e9e1f1fc2c7f3e14671c6a87a0b38cb.zip |
unetbootin: 681 -> 702
-rw-r--r-- | pkgs/tools/cd-dvd/unetbootin/default.nix | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 71a0a763285..f80f6060847 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -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; }; } |