diff options
| author | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
| commit | c92bca56f8ea5623cf01952621455db308d0f330 (patch) | |
| tree | f940e6e4fabd8e58b91fe885f9541205258023b2 /pkgs/tools/cd-dvd/brasero/default.nix | |
| parent | 0fdde5efd08c036fe9d73b4e65f2ba9797053d0f (diff) | |
| parent | 94520a25adc6b6bee799ec9dab344cfdad3f7180 (diff) | |
| download | nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.gz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.bz2 nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.lz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.xz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.zst nixlib-c92bca56f8ea5623cf01952621455db308d0f330.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/cd-dvd/brasero/default.nix')
| -rw-r--r-- | pkgs/tools/cd-dvd/brasero/default.nix | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 91a5440df3ec..e903601c81dd 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify -, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, cdrdao -, dvdplusrwtools, cdrtools, libdvdcss, wrapGAppsHook }: +{ stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify +, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs +, vcdimager, wrapGAppsHook }: + +# libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590 let major = "3.12"; - minor = "0"; - binpath = stdenv.lib.makeBinPath [ dvdauthor cdrdao dvdplusrwtools cdrtools ]; + minor = "1"; + binpath = lib.makeBinPath [ dvdauthor vcdimager ]; in stdenv.mkDerivation rec { version = "${major}.${minor}"; @@ -13,12 +15,12 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz"; - sha256 = "68fef2699b772fa262d855dac682100dbfea05563a7e4056eff8fe6447aec2fc"; + sha256 = "09vi2hyhl0bz7imv3ky6h7x5m3d546n968wcghydwrkvwm9ylpls"; }; nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; - buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libdvdcss + buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libburn libisofs gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ]; @@ -27,14 +29,15 @@ in stdenv.mkDerivation rec { # will obviously not work on nix patches = [ ./remove-symlink-check.patch ]; + enableParallelBuilding = true; + configureFlags = [ "--with-girdir=$out/share/gir-1.0" - "--with-typelibdir=$out/lib/girepository-1.0" ]; - - NIX_CFLAGS_LINK = [ "-ldvdcss" ]; + "--with-typelibdir=$out/lib/girepository-1.0" + ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${binpath}") + gappsWrapperArgs+=(--prefix PATH : "${binpath}" --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") ''; meta = with stdenv.lib; { |