diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-05 19:25:05 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-05 19:25:05 +0200 |
| commit | a9f37d1c250ebef05fa81909b2583642d23811b7 (patch) | |
| tree | 451ccefd892e66700ec831b31505cc4b9a80bff4 /pkgs/development/compilers | |
| parent | a137be55907a0e083a192ee56b7f6f0a6369ab02 (diff) | |
| parent | c45eadf31ddf61328a33dc9215c4b1f1f4f2c0d2 (diff) | |
| download | nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.tar nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.tar.gz nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.tar.bz2 nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.tar.lz nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.tar.xz nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.tar.zst nixlib-a9f37d1c250ebef05fa81909b2583642d23811b7.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.4/llvm.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.5/llvm.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/10.nix | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 30f2dba28831..0b29b04825a1 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -90,6 +90,6 @@ in stdenv.mkDerivation rec { homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"]; }; } diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 4d0cb8930f57..7dc134b4fcfd 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"]; }; } diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index bc7eafb92215..9cc774727b71 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -4,7 +4,7 @@ , libjpeg, giflib , setJavaClassPath , minimal ? false -, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: let @@ -38,7 +38,7 @@ let libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst libXi libXinerama libXcursor lndir fontconfig ] ++ lib.optionals (!minimal && enableGnome2) [ - gtk2 gnome_vfs GConf glib + gtk3 gnome_vfs GConf glib ]; patches = [ @@ -80,7 +80,7 @@ let NIX_LDFLAGS= lib.optionals (!minimal) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" ] ++ lib.optionals (!minimal && enableGnome2) [ - "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" ]; buildFlags = [ "all" ]; |