diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-19 00:41:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 00:41:01 +0000 |
| commit | d73a492e831d91dc62f97132e3e545bb9247dfc8 (patch) | |
| tree | cfbc3be5512b1fe65c5db7c880b5c83eed7cf600 /pkgs/tools/graphics | |
| parent | 8497314b8eaee8b43e06c79f02e9d3ac65a94336 (diff) | |
| parent | aea8bbde8da0a9279d832f6fbd3afd916f972957 (diff) | |
| download | nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.gz nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.bz2 nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.lz nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.xz nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.zst nixpkgs-d73a492e831d91dc62f97132e3e545bb9247dfc8.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/epstool/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/graphics/imgurbash2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/spirv-cross/default.nix | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix index 8052434ff0b..6910f458a17 100644 --- a/pkgs/tools/graphics/epstool/default.nix +++ b/pkgs/tools/graphics/epstool/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1pfgqbipwk36clhma2k365jkpvyy75ahswn8jczzys382jalpwgk"; }; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CLINK=${stdenv.cc.targetPrefix}cc" + "LINK=${stdenv.cc.targetPrefix}cc" + ]; + installPhase = '' make EPSTOOL_ROOT=$out install ''; @@ -20,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm"; license = licenses.gpl2; maintainers = [ maintainers.asppsa ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 8b79e3373a6..30848d7d0dc 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A shell script that uploads images to imgur"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; homepage = "https://github.com/ram-on/imgurbash2"; }; diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index cb5a37527bf..19359698f02 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A tool designed for parsing and converting SPIR-V to other shader languages"; homepage = "https://github.com/KhronosGroup/SPIRV-Cross"; changelog = "https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/${version}"; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; }; |