diff options
author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-07-15 12:31:18 +0200 |
---|---|---|
committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-07-15 12:31:18 +0200 |
commit | 18774d4173103f9274d769e36feaf8d922587e92 (patch) | |
tree | dfa662d9cb325bd8cfb3bcd0e1e951acf9aee882 /pkgs/applications/misc | |
parent | 0ef23893277ecff1511b13eede17c336a4a4c047 (diff) | |
parent | 64a64e7483581b2ea64b48a74671681176d14631 (diff) | |
download | nixlib-18774d4173103f9274d769e36feaf8d922587e92.tar nixlib-18774d4173103f9274d769e36feaf8d922587e92.tar.gz nixlib-18774d4173103f9274d769e36feaf8d922587e92.tar.bz2 nixlib-18774d4173103f9274d769e36feaf8d922587e92.tar.lz nixlib-18774d4173103f9274d769e36feaf8d922587e92.tar.xz nixlib-18774d4173103f9274d769e36feaf8d922587e92.tar.zst nixlib-18774d4173103f9274d769e36feaf8d922587e92.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/gutenberg/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/misc/mucommander/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/misc/termite/add_errno_header.patch | 24 | ||||
-rw-r--r-- | pkgs/applications/misc/termite/default.nix | 15 | ||||
-rw-r--r-- | pkgs/applications/misc/termite/remove_ldflags_macos.patch | 25 |
5 files changed, 66 insertions, 14 deletions
diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix index 7a04bd7194f2..8ab840221815 100644 --- a/pkgs/applications/misc/gutenberg/default.nix +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "gutenberg-${version}"; - version = "0.3.1"; + version = "0.3.4"; src = fetchFromGitHub { owner = "Keats"; repo = "gutenberg"; rev = "v${version}"; - sha256 = "03zhbwxp4dbqydiydx0hpp3vpg769zzn5i95h2sl868mpfia8gyd"; + sha256 = "1v26q1m3bx7mdmmwgd6p601ncf13rr4rrx9s06fiy8vnd0ar1vlf"; }; - cargoSha256 = "0441lbmxx16aar6fn651ihk3psrx0lk3qdbbyih05xjlkkbk1qxs"; + cargoSha256 = "0cdy0wvibkpnmlqwxvn02a2k2vqy6zdqzflj2dh6g1cjbz1j8qh5"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { description = "An opinionated static site generator with everything built-in"; homepage = https://www.getgutenberg.io; license = licenses.mit; - maintainers = []; + maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index fdb236194f9c..d6153d2268b6 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre }: +{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre, gsettings-desktop-schemas }: let version = "0.9.2"; @@ -10,7 +10,7 @@ let rev = version; sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8"; }; - + postPatch = '' # there is no .git anyway substituteInPlace build.gradle \ @@ -69,7 +69,9 @@ in stdenv.mkDerivation { installPhase = '' mkdir $out tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1 - wrapProgram $out/bin/mucommander --set JAVA_HOME ${jre} + wrapProgram $out/bin/mucommander \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ + --set JAVA_HOME ${jre} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/termite/add_errno_header.patch b/pkgs/applications/misc/termite/add_errno_header.patch new file mode 100644 index 000000000000..81283f86a21d --- /dev/null +++ b/pkgs/applications/misc/termite/add_errno_header.patch @@ -0,0 +1,24 @@ +From 95c90f302c384f410dc92e64468ac7061b57fe2d Mon Sep 17 00:00:00 2001 +From: Michael Hoang <enzime@users.noreply.github.com> +Date: Fri, 13 Jul 2018 19:03:09 +1000 +Subject: [PATCH] Add errno.h header which isn't always included automatically. + +--- + termite.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/termite.cc b/termite.cc +index 160fe82..13e2572 100644 +--- a/termite.cc ++++ b/termite.cc +@@ -21,6 +21,7 @@ + #include <cstdlib> + #include <cstring> + #include <cmath> ++#include <errno.h> + #include <functional> + #include <limits> + #include <map> +-- +2.17.1 + diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 46276bbb03fb..560dff594275 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin +{ stdenv, fetchFromGitHub, lib, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin , configFile ? null }: @@ -7,16 +7,17 @@ let termite = stdenv.mkDerivation { name = "termite-${version}"; - src = fetchgit { - url = "https://github.com/thestinger/termite"; - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + owner = "thestinger"; + repo = "termite"; + rev = "v${version}"; sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj"; + fetchSubmodules = true; }; # https://github.com/thestinger/termite/pull/516 - patches = [ ./url_regexp_trailing.patch ]; - - postPatch = "sed '1i#include <math.h>' -i termite.cc"; + patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch + ] ++ lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/misc/termite/remove_ldflags_macos.patch b/pkgs/applications/misc/termite/remove_ldflags_macos.patch new file mode 100644 index 000000000000..f8c68518bb4d --- /dev/null +++ b/pkgs/applications/misc/termite/remove_ldflags_macos.patch @@ -0,0 +1,25 @@ +From 1b5a6934635c55472eb7949bd87ab3f45fa1b2f3 Mon Sep 17 00:00:00 2001 +From: Michael Hoang <enzime@users.noreply.github.com> +Date: Fri, 13 Jul 2018 19:01:51 +1000 +Subject: [PATCH] Remove --as-needed flag from ld to fix compilation on macOS. + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index b115f42..ab301ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,7 @@ ifeq (${CXX}, clang++) + CXXFLAGS += -Wimplicit-fallthrough + endif + +-LDFLAGS := -s -Wl,--as-needed ${LDFLAGS} ++LDFLAGS := -s -Wl ${LDFLAGS} + LDLIBS := ${shell pkg-config --libs ${GTK} ${VTE}} + + termite: termite.cc url_regex.hh util/clamp.hh util/maybe.hh util/memory.hh +-- +2.17.1 + |