diff options
author | Tim Cuthbertson <tim@gfxmonk.net> | 2018-04-22 11:17:59 +1000 |
---|---|---|
committer | Tim Cuthbertson <tim@gfxmonk.net> | 2018-04-22 15:16:02 +1000 |
commit | b52f5dba48d39a67112f95a15dd0a786959f0e52 (patch) | |
tree | 61e73bfa1fb06b7583786624c08f19a8c80abb2a /pkgs/development/tools/build-managers | |
parent | 313b5fce7b8eea04029566c22891d8159b91df2c (diff) | |
download | nixpkgs-b52f5dba48d39a67112f95a15dd0a786959f0e52.tar nixpkgs-b52f5dba48d39a67112f95a15dd0a786959f0e52.tar.gz nixpkgs-b52f5dba48d39a67112f95a15dd0a786959f0e52.tar.bz2 nixpkgs-b52f5dba48d39a67112f95a15dd0a786959f0e52.tar.lz nixpkgs-b52f5dba48d39a67112f95a15dd0a786959f0e52.tar.xz nixpkgs-b52f5dba48d39a67112f95a15dd0a786959f0e52.tar.zst nixpkgs-b52f5dba48d39a67112f95a15dd0a786959f0e52.zip |
gup: simplify build expression
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r-- | pkgs/development/tools/build-managers/gup/build.nix | 16 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gup/default.nix | 32 |
2 files changed, 18 insertions, 30 deletions
diff --git a/pkgs/development/tools/build-managers/gup/build.nix b/pkgs/development/tools/build-managers/gup/build.nix deleted file mode 100644 index a9af037bb81..00000000000 --- a/pkgs/development/tools/build-managers/gup/build.nix +++ /dev/null @@ -1,16 +0,0 @@ -# NOTE: this file is copied from the upstream repository for this package. -# Please submit any changes you make here to https://github.com/timbertson/gup/ - -{ stdenv, lib, python, which, pychecker ? null }: -{ src, version, meta ? {} }: -stdenv.mkDerivation { - inherit src meta; - name = "gup-${version}"; - buildInputs = lib.remove null [ python which pychecker ]; - SKIP_PYCHECKER = pychecker == null; - buildPhase = "make python"; - installPhase = '' - mkdir $out - cp -r python/bin $out/bin - ''; -} diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 8d1ad4490e9..748a59bda2f 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, lib, python, which }: -let +{ stdenv, fetchFromGitHub, lib, python, which, pychecker ? null }: +stdenv.mkDerivation rec { version = "0.7.0"; src = fetchFromGitHub { sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; @@ -7,15 +7,19 @@ let repo = "gup"; owner = "timbertson"; }; -in -import ./build.nix - { inherit stdenv lib python which; } - { inherit src version; - meta = { - inherit (src.meta) homepage; - description = "A better make, inspired by djb's redo"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.timbertson ]; - platforms = stdenv.lib.platforms.all; - }; - } + name = "gup-${version}"; + buildInputs = lib.remove null [ python which pychecker ]; + SKIP_PYCHECKER = pychecker == null; + buildPhase = "make python"; + installPhase = '' + mkdir $out + cp -r python/bin $out/bin + ''; + meta = { + inherit (src.meta) homepage; + description = "A better make, inspired by djb's redo"; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.timbertson ]; + platforms = stdenv.lib.platforms.all; + }; +} |