diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-12-12 02:53:47 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-12-13 15:14:00 +0300 |
| commit | 28f8ec1df6aaa8dfdfe736da5fce35bcce92ee79 (patch) | |
| tree | 9911a20285a6db05ade9f7d75a778cb20dbe5179 /pkgs/tools/cd-dvd/brasero | |
| parent | a4e8b8ef066fed51e2f87ff67e7d46f9f6926e35 (diff) | |
brasero: cleanup
Diffstat (limited to 'pkgs/tools/cd-dvd/brasero')
| -rw-r--r-- | pkgs/tools/cd-dvd/brasero/default.nix | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index d7773b0ba0cce..3185242f5ce4d 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,15 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify -, libcanberra_gtk3, intltool, gnome3, makeWrapper, dvdauthor, cdrdao -, dvdplusrwtools, cdrtools, libdvdcss }: +, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, cdrdao +, dvdplusrwtools, cdrtools, libdvdcss, wrapGAppsHook }: let major = "3.12"; minor = "0"; - GST_PLUGIN_PATH = stdenv.lib.makeSearchPath "lib/gstreamer-1.0" [ - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-libav ]; + binpath = stdenv.lib.makeSearchPath "bin" [ dvdauthor cdrdao dvdplusrwtools cdrtools ]; in stdenv.mkDerivation rec { version = "${major}.${minor}"; @@ -20,13 +16,12 @@ in stdenv.mkDerivation rec { sha256 = "68fef2699b772fa262d855dac682100dbfea05563a7e4056eff8fe6447aec2fc"; }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard dvdauthor - cdrdao dvdplusrwtools cdrtools ]; + nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; - buildInputs = [ pkgconfig gtk3 itstool libxml2 libnotify libcanberra_gtk3 - intltool gnome3.gsettings_desktop_schemas makeWrapper libdvdcss - gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.dconf - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; + buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libdvdcss + 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 ]; # brasero checks that the applications it uses aren't symlinks, but this # will obviously not work on nix @@ -36,16 +31,10 @@ in stdenv.mkDerivation rec { "--with-girdir=$out/share/gir-1.0" "--with-typelibdir=$out/lib/girepository-1.0" ]; + NIX_CFLAGS_LINK = [ "-ldvdcss" ]; + preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GST_PLUGIN_PATH : "${GST_PLUGIN_PATH}" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ - --prefix LD_LIBRARY_PATH : ${libdvdcss}/lib - done - rm $out/share/icons/hicolor/icon-theme.cache + gappsWrapperArgs+=(--prefix PATH : "${binpath}") ''; meta = with stdenv.lib; { |