From 139b10eb93768ad75b505754d46c359d29fb5f81 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 8 Nov 2013 12:19:01 +0400 Subject: [PATCH 1/2] qvim: fix stdenvAdapters issue --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30089eeb16458..9a9a531c07a28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8893,6 +8893,8 @@ let features = "huge"; # one of tiny, small, normal, big or huge lua = pkgs.lua5; flags = [ "python" "X11" ]; # only flag "X11" by now + + inherit stdenvAdapters gccApple; }); virtviewer = callPackage ../applications/virtualization/virt-viewer {}; From 2b1b4f3d3a3b48b05916da29e44ae78a4b1532c1 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 8 Nov 2013 12:23:04 +0400 Subject: [PATCH 2/2] qvim: chage platforms from 'unix' to 'linux' I have no Darwin machine available so lets test qvim on Linux for now --- pkgs/applications/editors/vim/qvim.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index ca8e71fc58f44..15a147319a151 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -19,7 +19,8 @@ composableDerivation { sha256 = "1qa3xl1b9gqw66p71h53l7ibs4y3zfyj553jss70ybxaxchbhi5b"; }; - # FIXME: adopt Darwin fixes from vim/default.nix + # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux + # to meta.platforms.unix preConfigure = assert (! stdenv.isDarwin); ""; configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ]; @@ -108,7 +109,7 @@ composableDerivation { description = "The most popular clone of the VI editor (Qt GUI fork)"; homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; maintainers = with maintainers; [ smironov ]; - platforms = platforms.unix; + platforms = platforms.linux; }; })