diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
| commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
| tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/libraries/libow/default.nix | |
| parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
| parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
| download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip | |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libow/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libow/default.nix | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libow/default.nix b/nixpkgs/pkgs/development/libraries/libow/default.nix index e4a8d95f4b0e..5340caeff0a8 100644 --- a/nixpkgs/pkgs/development/libraries/libow/default.nix +++ b/nixpkgs/pkgs/development/libraries/libow/default.nix @@ -11,7 +11,28 @@ stdenv.mkDerivation rec { sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s"; }; - nativeBuildInputs = [ autoconf automake pkg-config ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + + preConfigure = '' + # Tries to use glibtoolize on Darwin, but it shouldn't for Nix. + sed -i -e 's/glibtoolize/libtoolize/g' bootstrap + ./bootstrap + ''; + + configureFlags = [ + "--disable-owtcl" + "--disable-owphp" + "--disable-owpython" + "--disable-zero" + "--disable-owshell" + "--disable-owhttpd" + "--disable-owftpd" + "--disable-owserver" + "--disable-owperl" + "--disable-owtap" + "--disable-owmon" + "--disable-owexternal" + ]; meta = with lib; { description = "1-Wire File System full library"; @@ -20,24 +41,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ disserman ]; platforms = platforms.unix; }; - - buildInputs = [ libtool ]; - - preConfigure = "./bootstrap"; - - configureFlags = [ - "--disable-owtcl" - "--disable-owphp" - "--disable-owpython" - "--disable-zero" - "--disable-owshell" - "--disable-owhttpd" - "--disable-owftpd" - "--disable-owserver" - "--disable-owperl" - "--disable-owtcl" - "--disable-owtap" - "--disable-owmon" - "--disable-owexternal" - ]; } |