From 96ea4f91951010ef9c560c13122a6f8ebfac2816 Mon Sep 17 00:00:00 2001 From: Hussein Ait Lahcen Date: Thu, 21 Jun 2018 10:44:11 +0200 Subject: refact: 1-1 folder-package --- clever-tools/default.nix | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 clever-tools/default.nix (limited to 'clever-tools') diff --git a/clever-tools/default.nix b/clever-tools/default.nix new file mode 100644 index 0000000..8032014 --- /dev/null +++ b/clever-tools/default.nix @@ -0,0 +1,46 @@ +{ pkgs ? import {} }: + +with pkgs; + +let + version = "0.9.3"; + + nodegit = import ../nodegit/default.nix { inherit pkgs; }; + + libs = [ stdenv.cc.cc glibc ]; + +in + + stdenv.mkDerivation { + name = "clever-tools-${version}"; + + buildInputs = [ nodegit ]; + + src = fetchurl { + url = "https://clever-tools.cellar.services.clever-cloud.com/releases/${version}/clever-tools-${version}_linux.tar.gz"; + sha256 = "adcae5af912dcbdc74d996b6e94767f24d16bf1bdcd5073797f999fe75b018a4"; + }; + + libPath = stdenv.lib.makeLibraryPath libs; + + nodegitLibrary = stdenv.lib.makeLibraryPath [ nodegit ]; + + installPhase = '' + tar --extract --file=$src linux/clever --transform 's/linux\///' + bin=$out/bin/clever + mkdir -p $out/bin + mv clever $bin + ln -s "$nodegitLibrary/nodegit.node" "$out/bin/nodegit.node" + ''; + + dontStrip = "true"; + + preFixup = '' + bin=$out/bin/clever + patchelf \ + --set-rpath "$libPath" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$bin" + ''; + + } -- cgit v1.2.3 From 8be0d90992efd13b71166cd32d0fc6f10a6ed600 Mon Sep 17 00:00:00 2001 From: Hussein Ait Lahcen Date: Thu, 21 Jun 2018 10:48:03 +0200 Subject: refact: make packages function-like --- clever-tools/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'clever-tools') diff --git a/clever-tools/default.nix b/clever-tools/default.nix index 8032014..497e911 100644 --- a/clever-tools/default.nix +++ b/clever-tools/default.nix @@ -1,14 +1,9 @@ -{ pkgs ? import {} }: - -with pkgs; +{ stdenv, fetchurl, glibc, nodegit }: let version = "0.9.3"; - nodegit = import ../nodegit/default.nix { inherit pkgs; }; - libs = [ stdenv.cc.cc glibc ]; - in stdenv.mkDerivation { -- cgit v1.2.3 From e13be120a535969d8975be993fb9e35c780094e2 Mon Sep 17 00:00:00 2001 From: Hussein Ait Lahcen Date: Thu, 21 Jun 2018 10:50:37 +0200 Subject: refact: least fixed point --- clever-tools/default.nix | 55 ++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 30 deletions(-) (limited to 'clever-tools') diff --git a/clever-tools/default.nix b/clever-tools/default.nix index 497e911..6c729a5 100644 --- a/clever-tools/default.nix +++ b/clever-tools/default.nix @@ -1,41 +1,36 @@ { stdenv, fetchurl, glibc, nodegit }: -let +stdenv.mkDerivation rec { + name = "clever-tools-${version}"; version = "0.9.3"; - libs = [ stdenv.cc.cc glibc ]; -in + src = fetchurl { + url = "https://clever-tools.cellar.services.clever-cloud.com/releases/${version}/clever-tools-${version}_linux.tar.gz"; + sha256 = "adcae5af912dcbdc74d996b6e94767f24d16bf1bdcd5073797f999fe75b018a4"; + }; - stdenv.mkDerivation { - name = "clever-tools-${version}"; + buildInputs = [ nodegit ]; - buildInputs = [ nodegit ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc glibc ]; - src = fetchurl { - url = "https://clever-tools.cellar.services.clever-cloud.com/releases/${version}/clever-tools-${version}_linux.tar.gz"; - sha256 = "adcae5af912dcbdc74d996b6e94767f24d16bf1bdcd5073797f999fe75b018a4"; - }; + nodegitLibrary = stdenv.lib.makeLibraryPath [ nodegit ]; - libPath = stdenv.lib.makeLibraryPath libs; + installPhase = '' + tar --extract --file=$src linux/clever --transform 's/linux\///' + bin=$out/bin/clever + mkdir -p $out/bin + mv clever $bin + ln -s "$nodegitLibrary/nodegit.node" "$out/bin/nodegit.node" + ''; - nodegitLibrary = stdenv.lib.makeLibraryPath [ nodegit ]; + dontStrip = "true"; - installPhase = '' - tar --extract --file=$src linux/clever --transform 's/linux\///' - bin=$out/bin/clever - mkdir -p $out/bin - mv clever $bin - ln -s "$nodegitLibrary/nodegit.node" "$out/bin/nodegit.node" - ''; + preFixup = '' + bin=$out/bin/clever + patchelf \ + --set-rpath "$libPath" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$bin" + ''; - dontStrip = "true"; - - preFixup = '' - bin=$out/bin/clever - patchelf \ - --set-rpath "$libPath" \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$bin" - ''; - - } +} -- cgit v1.2.3