nixos-config/nix-public-expressions
3
0
Fork 0
Code Pull Requests Releases Activity

idea: essai fix stdenv

Browse Source
This commit is contained in:
Jean-Pierre PRUNARET
2017-03-04 15:05:36 +01:00
parent bdf20a261e
commit f64ce13cd9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
idea/default.nix
View File

@@ -1,5 +1,5 @@
{ nixpkgs ? import <nixpkgs> {} { nixpkgs ? import <nixpkgs> {}
, stdenv ? nixpkgs.stdenv , astdenv ? nixpkgs.stdenv
#, callPackage #, callPackage
#, fetchurl #, fetchurl
#, makeDesktopItem #, makeDesktopItem
@@ -18,7 +18,7 @@
}: }:
with nixpkgs; with nixpkgs;
assert stdenv.isLinux; assert astdenv.isLinux;
let let
mkIdeaProduct = callPackage ./common.nix { }; mkIdeaProduct = callPackage ./common.nix { };
@@ -27,7 +27,7 @@ let
(mkIdeaProduct rec { (mkIdeaProduct rec {
inherit name version src wmClass jdk; inherit name version src wmClass jdk;
product = "IDEA"; product = "IDEA";
meta = with stdenv.lib; { meta = with astdenv.lib; {
homepage = "https://www.jetbrains.com/idea/"; homepage = "https://www.jetbrains.com/idea/";
inherit description license; inherit description license;
longDescription = '' longDescription = ''
@@ -35,7 +35,7 @@ let
environment for building Google Android apps Integration environment for building Google Android apps Integration
with JUnit, TestNG, popular SCMs, Ant & Maven. with JUnit, TestNG, popular SCMs, Ant & Maven.
''; '';
maintainers = with maintainers; [ edwtjo ]; maintainers = with maintainers; [ jpierre03 ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}); });
@@ -46,7 +46,7 @@ in
name = "idea-ultimate-${version}"; name = "idea-ultimate-${version}";
version = "14.1.7"; version = "14.1.7";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; 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; #license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";

6
release.nix
View File

@@ -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; }); 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; midpix.slibtool = import ./midipix.nix;
r6d.geos = import ./geos.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; r6d.osm2pgsql = import ./osm2pgsql/default.nix;
} /* // { } /* // {
# Simply assign a derivation to an attribute to have it built. # Simply assign a derivation to an attribute to have it built.