summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorSergey Mironov <grrwlf@gmail.com>2013-11-06 11:27:06 +0400
committerSergey Mironov <grrwlf@gmail.com>2013-11-06 11:27:06 +0400
commitc8bb648f0f24ef891e9dead07b9bc6ff46929416 (patch)
tree0f524d563f78d488d8fe19d45f57af8febf294df /pkgs/applications/editors
parentd6d2de4147b8d0a19f6d70751d46eb405a2779b5 (diff)
downloadnixlib-c8bb648f0f24ef891e9dead07b9bc6ff46929416.tar
nixlib-c8bb648f0f24ef891e9dead07b9bc6ff46929416.tar.gz
nixlib-c8bb648f0f24ef891e9dead07b9bc6ff46929416.tar.bz2
nixlib-c8bb648f0f24ef891e9dead07b9bc6ff46929416.tar.lz
nixlib-c8bb648f0f24ef891e9dead07b9bc6ff46929416.tar.xz
nixlib-c8bb648f0f24ef891e9dead07b9bc6ff46929416.tar.zst
nixlib-c8bb648f0f24ef891e9dead07b9bc6ff46929416.zip
qvim: clean up the code
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/vim/qvim.nix21
1 files changed, 1 insertions, 20 deletions
diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix
index 85c177f31bce..ca8e71fc58f4 100644
--- a/pkgs/applications/editors/vim/qvim.nix
+++ b/pkgs/applications/editors/vim/qvim.nix
@@ -19,17 +19,8 @@ composableDerivation {
       sha256 = "1qa3xl1b9gqw66p71h53l7ibs4y3zfyj553jss70ybxaxchbhi5b";
     };
 
+    # FIXME: adopt Darwin fixes from vim/default.nix
     preConfigure = assert (! stdenv.isDarwin); "";
-    # # if darwin support is enabled, we want to make sure we're not building with
-    # # OS-installed python framework
-    # preConfigure
-    #   = stdenv.lib.optionalString
-    #     (stdenv.isDarwin && (config.vim.darwin or true)) ''
-    #       # TODO: we should find a better way of doing this as, if the configure
-    #       # file changes, we need to change these line numbers
-    #       sed -i "5641,5644d" src/auto/configure
-    #       sed -i "5648d" src/auto/configure
-    #     '';
 
     configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ];
 
@@ -37,16 +28,6 @@ composableDerivation {
       = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw libXau
           libXmu libICE qt4];
 
-    # prePatch = "cd src";
-    
-    # patches =
-    #   [ ./patches/7.4.001 ./patches/7.4.002 ./patches/7.4.003 ./patches/7.4.004
-    #     ./patches/7.4.005 ./patches/7.4.006 ./patches/7.4.007 ./patches/7.4.008
-    #     ./patches/7.4.009 ./patches/7.4.010 ./patches/7.4.011 ./patches/7.4.012
-    #     ./patches/7.4.013 ./patches/7.4.014 ./patches/7.4.015 ./patches/7.4.016
-    #     ./patches/7.4.017 ./patches/7.4.018 ./patches/7.4.019 ./patches/7.4.020
-    #     ./patches/7.4.021 ./patches/7.4.022 ./patches/7.4.023 ];
-
     # most interpreters aren't tested yet.. (see python for example how to do it)
     flags = {
         ftNix = {