diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-23 18:01:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-23 18:01:49 +0000 |
| commit | 3cdd7718204d55c46ee81a58706e2ef1d291cbe7 (patch) | |
| tree | dbcce89d48dbf6ebcf08c550b3b3c1170e53c3a3 /pkgs/misc/drivers | |
| parent | 1dd9fc27f56c8cdc6315f701148ca40b6bff8087 (diff) | |
| parent | 4688cd53b60d045633225e628d37f64105fb81ff (diff) | |
| download | nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.gz nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.bz2 nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.lz nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.xz nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.zst nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc/drivers')
| -rw-r--r-- | pkgs/misc/drivers/foomatic-filters/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/drivers/utsushi/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index b1095768691..c9a7d10bd8b 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: foomatic_rip-options.o:/build/foomatic-filters-4.0.17/options.c:49: multiple definition of # `cupsfilter'; foomatic_rip-foomaticrip.o:/build/foomatic-filters-4.0.17/foomaticrip.c:158: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installTargets = [ "install-cups" ]; diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 464bc12f491..e33a40f0ad5 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { libusb1.dev ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" "-Wno-error=parentheses" "-Wno-error=unused-variable" |