Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 019dcc374580
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d375f42115ce
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 13, 2017

  1. subtitleeditor: 0.52.1 -> 0.53.0 

    (cherry picked from commit c212ad1)
    @romildo @rycee
    romildo authored and rycee committed Feb 13, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vdemeester Vincent Demeester
    GPG key ID: 083CC6FD6EB699A3
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bb0f9d5 View commit details

  2. subtitle-editor: fix build 

    Apply Debian patch that makes the project build with later GStreamer
versions.

(cherry picked from commit 446aa68)
    @rycee
    rycee committed Feb 13, 2017
    Copy the full SHA
    d375f42 View commit details
Showing with 21 additions and 71 deletions.
  1. +21 −16 pkgs/applications/video/subtitleeditor/default.nix
  2. +0 −55 pkgs/applications/video/subtitleeditor/subtitleeditor-0.52.1-build-fix.patch
37 changes: 21 additions & 16 deletions pkgs/applications/video/subtitleeditor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,33 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake114x, intltool,
desktop_file_utils, enchant, gnome3, gst_all_1, hicolor_icon_theme,
libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook } :
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, desktop_file_utils,
enchant, gnome3, gst_all_1, hicolor_icon_theme, libsigcxx, libxmlxx,
xdg_utils, isocodes, wrapGAppsHook
}:

let
ver_maj = "0.52";
ver_min = "1";
ver_maj = "0.53";
ver_min = "0";
in

stdenv.mkDerivation rec {
name = "subtitle-editor-${ver_maj}.${ver_min}";

src = fetchurl {
url = "http://download.gna.org/subtitleeditor/${ver_maj}/subtitleeditor-${ver_maj}.${ver_min}.tar.gz";
sha256 = "1m8j2i27kjaycvp09b0knp9in61jd2dj852hrx5hvkrby70mygjv";
sha256 = "087rxignjawby4z3lwnh9m6pcjphl3a0jf7gfp83h92mzcq79b4g";
};

patches = [
(fetchpatch {
url = "https://sources.debian.net/data/main/s/subtitleeditor/0.53.0-2/debian/patches/03-fix-build-gstreamermm-1.8.0.patch";
sha256 = "0di2i34id5dqnd3glibhifair1kdfnv8ay3k64lirad726ardw2c";
})
];

nativeBuildInputs = [
autoconf automake114x pkgconfig intltool wrapGAppsHook
pkgconfig
intltool
file
wrapGAppsHook
];

buildInputs = [
@@ -35,20 +46,14 @@ stdenv.mkDerivation rec {
isocodes
];

NIX_CFLAGS_COMPILE = "-std=c++11 -DDEBUG";

enableParallelBuilding = true;

doCheck = true;
# disable check because currently making check in po fails
doCheck = false;

hardeningDisable = [ "format" ];

patches = [ ./subtitleeditor-0.52.1-build-fix.patch ];

preConfigure = ''
# ansi overrides -std, see src_configure
sed 's/\(CXXFLAGS\) -ansi/\1/' -i configure.ac configure
'';
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";

configureFlags = [ "--disable-debug" ];

55 changes: 0 additions & 55 deletions pkgs/applications/video/subtitleeditor/subtitleeditor-0.52.1-build-fix.patch
View file

This file was deleted.