From 81ca8af87072ca056e547c3d13378dd0ad5bc565 Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Fri, 9 Feb 2024 22:44:24 -0500 Subject: [PATCH] Refactor derivation definitions --- bash/default.nix | 6 +----- bash/soe-bash | 0 fish/default.nix | 6 +----- fish/soe-fish | 0 python/bin/soe-python | 0 5 files changed, 2 insertions(+), 10 deletions(-) mode change 100644 => 100755 bash/soe-bash mode change 100644 => 100755 fish/soe-fish mode change 100644 => 100755 python/bin/soe-python diff --git a/bash/default.nix b/bash/default.nix index fc38787..b11cdff 100644 --- a/bash/default.nix +++ b/bash/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , bash -, makeWrapper }: stdenv.mkDerivation { @@ -11,12 +10,9 @@ stdenv.mkDerivation { src = ./.; buildInputs = [ bash ]; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin - install -m555 soe-bash $out/bin - wrapProgram $out/bin/soe-bash \ - --prefix PATH : ${lib.makeBinPath [ bash ]} + cp soe-bash $out/bin ''; } diff --git a/bash/soe-bash b/bash/soe-bash old mode 100644 new mode 100755 diff --git a/fish/default.nix b/fish/default.nix index 3b14eb7..0d97b0c 100644 --- a/fish/default.nix +++ b/fish/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fish -, makeWrapper }: stdenv.mkDerivation { @@ -11,12 +10,9 @@ stdenv.mkDerivation { src = ./.; buildInputs = [ fish ]; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin - install -m555 soe-fish $out/bin - wrapProgram $out/bin/soe-fish \ - --prefix PATH : ${lib.makeBinPath [ fish ]} + cp soe-fish $out/bin ''; } diff --git a/fish/soe-fish b/fish/soe-fish old mode 100644 new mode 100755 diff --git a/python/bin/soe-python b/python/bin/soe-python old mode 100644 new mode 100755