diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-02 20:05:37 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-02 20:05:37 -0400 |
commit | cb278f70d0a0fe16ee59375e930ca09173fc4001 (patch) | |
tree | e49093045218f1b83df58b8f45f69f5f65a798db /pkgs/os-specific | |
parent | 0eb483819191a61bdef2674f6a52a415de0f99cd (diff) | |
parent | 3f4a353737f165d4935c0404404c0de6eea92093 (diff) | |
download | nixpkgs-cb278f70d0a0fe16ee59375e930ca09173fc4001.tar nixpkgs-cb278f70d0a0fe16ee59375e930ca09173fc4001.tar.gz nixpkgs-cb278f70d0a0fe16ee59375e930ca09173fc4001.tar.bz2 nixpkgs-cb278f70d0a0fe16ee59375e930ca09173fc4001.tar.lz nixpkgs-cb278f70d0a0fe16ee59375e930ca09173fc4001.tar.xz nixpkgs-cb278f70d0a0fe16ee59375e930ca09173fc4001.tar.zst nixpkgs-cb278f70d0a0fe16ee59375e930ca09173fc4001.zip |
Merge pull request #63520 from worldofpeace/dontConfigure
setup.sh: add dontConfigure
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/nmon/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/rfkill/udev.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/trace-cmd/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index bb00db9868e..a80252d6412 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses ]; - unpackPhase = ":"; + dontUnpack = true; buildPhase = "cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D X86"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index f9d6dc99db8..41dd3da9d31 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -34,7 +34,7 @@ let in stdenv.mkDerivation { name = "rfkill-udev"; - unpackPhase = "true"; + dontUnpack = true; dontBuild = true; installPhase = '' diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 1d1712f6b47..33dbfe5bf0a 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ asciidoc libxslt ]; - configurePhase = "true"; + dontConfigure = true; buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl all doc"; installPhase = "make prefix=$out install install_doc"; |