diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-07-13 07:13:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-07-13 07:13:56 +0200 |
| commit | 377324ca6d05eaf76788ff95f17bcb6895bdcf10 (patch) | |
| tree | 9cf7e361f087ea413e02cda45a27292bf5e01a08 /pkgs/misc | |
| parent | 5e6825612c9114c12eb9a99c0b42a5aba6289908 (diff) | |
| parent | 1e4290b78c055b3de85e4ad6e73bc147f12e4dd3 (diff) | |
| download | nixpkgs-377324ca6d05eaf76788ff95f17bcb6895bdcf10.tar nixpkgs-377324ca6d05eaf76788ff95f17bcb6895bdcf10.tar.gz nixpkgs-377324ca6d05eaf76788ff95f17bcb6895bdcf10.tar.bz2 nixpkgs-377324ca6d05eaf76788ff95f17bcb6895bdcf10.tar.lz nixpkgs-377324ca6d05eaf76788ff95f17bcb6895bdcf10.tar.xz nixpkgs-377324ca6d05eaf76788ff95f17bcb6895bdcf10.tar.zst nixpkgs-377324ca6d05eaf76788ff95f17bcb6895bdcf10.zip | |
Merge branch 'staging-next' (PR #91090)
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/drivers/cups-bjnp/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/emulators/retroarch/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index e9fac1c73e2..9dbfdd8b803 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/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index a9950a14b4d..bfc2c338769 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -43,9 +43,6 @@ stdenv.mkDerivation rec { libXdmcp libXext libXxf86vm mesa udev wayland libxkbcommon ]; - # we use prefix-less pkg-config - PKG_CONF_PATH = "pkg-config"; - enableParallelBuilding = true; configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ]; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index a1059559187..eca15faf1ad 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 b2ff6c79f5a..d3893934900 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'" |