diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-01 09:28:45 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-01 09:28:45 +0200 |
| commit | 00bbfccecf90f21b873d90bfeb3b81d7de79cf80 (patch) | |
| tree | 36b934248a5095b4d645d1fd6204732a4b0e9c0b /pkgs/misc | |
| parent | 2d00e8621ec23d39c47a5dc69fed312244507d09 (diff) | |
| parent | 1825ecc5ede0b5e3caeec9a61e9bdfab7b4ec769 (diff) | |
| download | nixlib-00bbfccecf90f21b873d90bfeb3b81d7de79cf80.tar nixlib-00bbfccecf90f21b873d90bfeb3b81d7de79cf80.tar.gz nixlib-00bbfccecf90f21b873d90bfeb3b81d7de79cf80.tar.bz2 nixlib-00bbfccecf90f21b873d90bfeb3b81d7de79cf80.tar.lz nixlib-00bbfccecf90f21b873d90bfeb3b81d7de79cf80.tar.xz nixlib-00bbfccecf90f21b873d90bfeb3b81d7de79cf80.tar.zst nixlib-00bbfccecf90f21b873d90bfeb3b81d7de79cf80.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/logging/beats/6.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/logging/beats/7.x.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index b16c0645cda8..8736edd0e61b 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "cups"; # After 2.2.6, CUPS requires headers only available in macOS 10.12+ - version = if stdenv.isDarwin then "2.2.6" else "2.3.1"; + version = if stdenv.isDarwin then "2.2.6" else "2.3.3"; passthru = { inherit version; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; sha256 = if version == "2.2.6" then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20" - else "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv"; + else "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6"; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index d3f284a2ddbb..c3bca18a9a44 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -47,7 +47,7 @@ in { ''; buildInputs = [ systemd.dev ]; postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' - patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; } diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index cdc8417a9c14..61c89339fe70 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -46,7 +46,7 @@ in { ''; buildInputs = [ systemd.dev ]; postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' - patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; } |