diff options
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/drivers/cups-bjnp/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index e9fac1c73e2f..9dbfdd8b8030 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; buildInputs = [cups]; - NIX_CFLAGS_COMPILE = [ "-include stdio.h" "-Wno-error=stringop-truncation" ]; + NIX_CFLAGS_COMPILE = [ + "-include stdio.h" + "-Wno-error=stringop-truncation" + "-Wno-error=deprecated-declarations" + ]; meta = { description = "CUPS back-end for Canon printers"; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index a10595591875..eca15faf1ad6 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -99,9 +99,6 @@ stdenv.mkDerivation rec { cp -r Resource "$out/share/ghostscript/${version}" - mkdir -p "$doc/share/doc/ghostscript" - mv "$doc/share/doc/${version}" "$doc/share/doc/ghostscript/" - ln -s "${fonts}" "$out/share/ghostscript/fonts" '' + stdenv.lib.optionalString stdenv.isDarwin '' for file in $out/lib/*.dylib* ; do diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index b2ff6c79f5aa..d38939349003 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -98,8 +98,6 @@ self: super: { # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). # The linked ruby code shows generates the required '.clang_complete' for cmake based projects # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 - # as an alternative you can execute the following command: - # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile') preFixup = '' substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc.lib}/lib/libclang.so'" |