Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bacfa2d9200e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ce7b327a52d1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 25, 2021

  1. lowdown: fix dylib on darwin

    @r-burns
    r-burns committed Jan 25, 2021
    Copy the full SHA
    c455bcb View commit details

  2. Merge pull request #110740 from r-burns/lowdown 

    lowdown: fix dylib on darwin
    @SuperSandro2000
    SuperSandro2000 authored Jan 25, 2021
    Copy the full SHA
    ce7b327 View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 pkgs/tools/typesetting/lowdown/default.nix
10 changes: 8 additions & 2 deletions pkgs/tools/typesetting/lowdown/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, which }:
{ lib, stdenv, fetchurl, fixDarwinDylibNames, which }:

stdenv.mkDerivation rec {
pname = "lowdown";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha512 = "18q8i8lh8w127vzw697n0bzv4mchhna1p4s672hjvy39l3ls8rlj5nwq5npr5fry06yil62sjmq4652vw29r8l49wwk5j82a8l2nr7c";
};

nativeBuildInputs = [ which ];
nativeBuildInputs = [ which ]
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];

configurePhase = ''
./configure PREFIX=''${!outputDev} \
@@ -20,6 +21,11 @@ stdenv.mkDerivation rec {
MANDIR=''${!outputMan}/share/man
'';

# Fix lib extension so that fixDarwinDylibNames detects it
postInstall = lib.optionalString stdenv.isDarwin ''
mv $lib/lib/liblowdown.{so,dylib}
'';

patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch;

meta = with lib; {