From bfaf508f4f68a49aea636c7e29a16fc6dcddf640 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 26 Sep 2017 14:19:36 +0000 Subject: [PATCH 1/3] far2l: unstable-2017-07-13 -> unstable-2017-09-25 --- pkgs/applications/misc/far2l/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 1097780723ec..3b63c90f0606 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -2,15 +2,15 @@ xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }: stdenv.mkDerivation rec { - rev = "de5554dbc0ec69329b75777d4a3b2f01851fc5ed"; - build = "unstable-2017-07-13.git${builtins.substring 0 7 rev}"; + rev = "73e52ccbc7626631b6898c7324413ee1fc09bc0e"; + build = "unstable-2017-09-25.git${builtins.substring 0 7 rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = rev; - sha256 = "07l8w9p6zxm9qgh9wlci584lgv8gd4aw742jaqh9acgkxy9caih8"; + sha256 = "0pg1l2k5ycm6whr39gshpbgw62v51rfz3ddi6qhcx0nyzxcrczy5"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; From b200a3417b36f85e9e5fd97002e9e2bbc3657eab Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 26 Sep 2017 22:28:51 +0000 Subject: [PATCH 2/3] far2l: support darwin --- pkgs/applications/misc/far2l/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 3b63c90f0606..ad1a1b951bdc 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, - xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }: + xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: +with stdenv.lib; stdenv.mkDerivation rec { rev = "73e52ccbc7626631b6898c7324413ee1fc09bc0e"; build = "unstable-2017-09-25.git${builtins.substring 0 7 rev}"; @@ -15,15 +16,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; - buildInputs = [ wxGTK30 glib pcre ]; + buildInputs = [ wxGTK30 glib pcre ] + ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; patches = [ ./add-nix-syntax-highlighting.patch ]; - postPatch = '' - echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh - - substituteInPlace far2l/bootstrap/open.sh \ + postPatch = optionalString stdenv.isLinux '' + substituteInPlace far2l/bootstrap/open.sh \ --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' + '' + optionalString stdenv.isDarwin '' + substituteInPlace far2l/CMakeLists.txt \ + --replace "-framework System" -lSystem + '' + '' + echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh substituteInPlace far2l/bootstrap/open.sh \ --replace 'xdg-open' '${xdg_utils}/bin/xdg-open' substituteInPlace far2l/vtcompletor.cpp \ @@ -62,7 +67,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = { description = "An orthodox file manager"; homepage = https://github.com/elfmz/far2l; license = licenses.gpl2; From a67bcf91d99453d93b0f64b54145a75f65b17776 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 1 Oct 2017 02:46:25 +0000 Subject: [PATCH 3/3] far2l: unstable-2017-09-25 -> unstable-2017-09-30 --- pkgs/applications/misc/far2l/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index ad1a1b951bdc..7bd876f1d4aa 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -3,15 +3,15 @@ with stdenv.lib; stdenv.mkDerivation rec { - rev = "73e52ccbc7626631b6898c7324413ee1fc09bc0e"; - build = "unstable-2017-09-25.git${builtins.substring 0 7 rev}"; + rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26"; + build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = rev; - sha256 = "0pg1l2k5ycm6whr39gshpbgw62v51rfz3ddi6qhcx0nyzxcrczy5"; + sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];