public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gcc-6

Browse Source
This commit is contained in:
Vladimír Čunát
2017-08-12 10:09:41 +02:00
parent 9bcee1051a e207d1f04a
commit 6899c7fdb9
2362 changed files with 36299 additions and 29476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/cd-dvd/brasero/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@
let
major = "3.12";
minor = "1";
minor = "2";
binpath = lib.makeBinPath [ dvdauthor vcdimager ];
in stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz";
sha256 = "09vi2hyhl0bz7imv3ky6h7x5m3d546n968wcghydwrkvwm9ylpls";
sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8";
};
nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
pkgs/tools/cd-dvd/lsdvd/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
meta = {
homepage = "http://sourceforge.net/projects/lsdvd/";
homepage = http://sourceforge.net/projects/lsdvd/;
shortDescription = "Display information about audio, video, and subtitle tracks on a DVD";
platforms = stdenv.lib.platforms.linux;
};
pkgs/tools/cd-dvd/unetbootin/default.nix
+25 -19
View File
@@ -1,31 +1,37 @@
{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
{ stdenv, fetchFromGitHub, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
, p7zip, mtools, syslinux }:
stdenv.mkDerivation rec {
name = "unetbootin-${version}";
version = "613";
version = "655";
src = fetchurl {
url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
sha256 = "1f389z5lqimp4hlxm6zlrh1ja474r6ivzb9r43i9bvf0z1n21f0q";
src = fetchFromGitHub {
owner = "unetbootin";
repo = "unetbootin";
rev = version;
sha256 = "1gis75vy172k7lgh8bwgap74s259y9x1wg3rkqhhqncl2vv0w1py";
};
sourceRoot = ".";
sourceRoot = "${name}-src/src/unetbootin";
buildInputs = [ makeWrapper qt4 qmake4Hook ];
buildInputs = [ qt4 ];
nativeBuildInputs = [ makeWrapper qmake4Hook ];
enableParallelBuilding = true;
# Lots of nice hard-coded paths...
postUnpack = ''
postPatch = ''
substituteInPlace unetbootin.cpp \
--replace /sbin/fdisk ${utillinux}/sbin/fdisk \
--replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
--replace /sbin/blkid ${utillinux}/sbin/blkid \
--replace /bin/df ${coreutils}/bin/df \
--replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
--replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
--replace /bin/df ${coreutils}/bin/df \
--replace /sbin/blkid ${utillinux}/sbin/blkid \
--replace /sbin/fdisk ${utillinux}/sbin/fdisk \
--replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
--replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
--replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
--replace /usr/share/syslinux ${syslinux}/share/syslinux
substituteInPlace main.cpp \
--replace /usr/share/unetbootin $out/share/unetbootin
substituteInPlace unetbootin.desktop \
--replace /usr/bin $out/bin
'';
@@ -46,15 +52,15 @@ stdenv.mkDerivation rec {
cp unetbootin.desktop $out/share/applications
wrapProgram $out/bin/unetbootin \
--prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]} \
--prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \
--set QT_X11_NO_MITSHM 1
'';
meta = with stdenv.lib; {
homepage = http://unetbootin.sourceforge.net/;
homepage = http://unetbootin.sourceforge.net/;
description = "A tool to create bootable live USB drives from ISO images";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.ebzzry ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ebzzry ];
};
}