From f64ce13cd9b85a33f6cce78194a20630f8a0de32 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sat, 4 Mar 2017 15:05:36 +0100
Subject: [PATCH] idea: essai fix stdenv

---
 idea/default.nix | 10 +++++-----
 release.nix      |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/idea/default.nix b/idea/default.nix
index cebf5ef..89fd942 100644
--- a/idea/default.nix
+++ b/idea/default.nix
@@ -1,5 +1,5 @@
 { nixpkgs ? import <nixpkgs> {} 
-, stdenv ? nixpkgs.stdenv
+, astdenv ? nixpkgs.stdenv
 #, callPackage
 #, fetchurl
 #, makeDesktopItem
@@ -18,7 +18,7 @@
 }:
 
 with nixpkgs;
-assert stdenv.isLinux;
+assert astdenv.isLinux;
 
 let
   mkIdeaProduct = callPackage ./common.nix { };
@@ -27,7 +27,7 @@ let
     (mkIdeaProduct rec {
       inherit name version src wmClass jdk;
       product = "IDEA";
-      meta = with stdenv.lib; {
+      meta = with astdenv.lib; {
         homepage = "https://www.jetbrains.com/idea/";
         inherit description license;
         longDescription = ''
@@ -35,7 +35,7 @@ let
           environment for building Google Android apps Integration
           with JUnit, TestNG, popular SCMs, Ant & Maven.
         '';
-        maintainers = with maintainers; [ edwtjo ];
+        maintainers = with maintainers; [ jpierre03 ];
         platforms = platforms.linux;
       };
     });
@@ -46,7 +46,7 @@ in
     name = "idea-ultimate-${version}";
     version = "14.1.7";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
-    license = stdenv.lib.licenses.bsd3;
+    license = astdenv.lib.licenses.bsd3;
     #license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
diff --git a/release.nix b/release.nix
index 072137e..2b55fa0 100644
--- a/release.nix
+++ b/release.nix
@@ -1,5 +1,5 @@
-{
-  supportedSystems ? [ "x86_64-linux" ]
+{ supportedSystems ? [ "x86_64-linux" ]
+, nixpkgs ? import <nixpkgs> {}
 }:
 
 with (import <nixpkgs/pkgs/top-level/release-lib.nix> { inherit supportedSystems; });
@@ -30,7 +30,7 @@ with (import <nixpkgs/pkgs/top-level/release-lib.nix> { inherit supportedSystems
   midpix.slibtool = import ./midipix.nix;
 
   r6d.geos = import ./geos.nix;
-  r6d.idea14-ultimate = import ./idea/default.nix;
+  r6d.idea14-ultimate = import ./idea/default.nix { inherit nixpkgs;};
   r6d.osm2pgsql = import ./osm2pgsql/default.nix;
 } /*  // {
   # Simply assign a derivation to an attribute to have it built.